Commit 0c0a1d73 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avformat/Makefile: Remove false dependencies of WebM and Matroska muxer

These muxers don't depend on the WebM Chunk or the WebM DASH Manifest
muxers.

Furthermore, remove some #if checks in webm_chunk.c and webmdashenc.c.
They are always true now that webm_chunk.c and webmdashenc.c are only
compiled when their corresponding muxers are enabled.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent a51d1b36
...@@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ ...@@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
flac_picture.o replaygain.o flac_picture.o replaygain.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
av1.o avc.o hevc.o \ av1.o avc.o hevc.o \
flacenc_header.o avlanguage.o vorbiscomment.o wv.o \ flacenc_header.o avlanguage.o \
webmdashenc.o webm_chunk.o vorbiscomment.o wv.o
OBJS-$(CONFIG_MD5_MUXER) += hashenc.o OBJS-$(CONFIG_MD5_MUXER) += hashenc.o
OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o
OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o
...@@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o ...@@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
av1.o avc.o hevc.o \ av1.o avc.o hevc.o \
flacenc_header.o avlanguage.o \ flacenc_header.o avlanguage.o \
wv.o vorbiscomment.o \ wv.o vorbiscomment.o
webmdashenc.o webm_chunk.o
OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o
OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o
OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o
......
...@@ -284,7 +284,6 @@ static const AVOption options[] = { ...@@ -284,7 +284,6 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
#if CONFIG_WEBM_CHUNK_MUXER
static const AVClass webm_chunk_class = { static const AVClass webm_chunk_class = {
.class_name = "WebM Chunk Muxer", .class_name = "WebM Chunk Muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
...@@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = { ...@@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = {
.deinit = webm_chunk_deinit, .deinit = webm_chunk_deinit,
.priv_class = &webm_chunk_class, .priv_class = &webm_chunk_class,
}; };
#endif
...@@ -559,7 +559,6 @@ static const AVOption options[] = { ...@@ -559,7 +559,6 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
#if CONFIG_WEBM_DASH_MANIFEST_MUXER
static const AVClass webm_dash_class = { static const AVClass webm_dash_class = {
.class_name = "WebM DASH Manifest muxer", .class_name = "WebM DASH Manifest muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
...@@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { ...@@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = {
.write_packet = webm_dash_manifest_write_packet, .write_packet = webm_dash_manifest_write_packet,
.priv_class = &webm_dash_class, .priv_class = &webm_dash_class,
}; };
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment