diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-07 22:14:13 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-14 18:43:44 +0200 |
| commit | 0c0a1d73c2310ffe52a6545a860f2e1e19e06578 (patch) | |
| tree | 9f11f3bcfc0410ad16dc31d49d5a1cfc45170206 | |
| parent | a51d1b3634e11c8d92acbf8b7e88585d5de07575 (diff) | |
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: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/Makefile | 7 | ||||
| -rw-r--r-- | libavformat/webm_chunk.c | 2 | ||||
| -rw-r--r-- | libavformat/webmdashenc.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index b34e5bc3ce..eab8fe5c49 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ flac_picture.o replaygain.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ - flacenc_header.o avlanguage.o vorbiscomment.o wv.o \ - webmdashenc.o webm_chunk.o + flacenc_header.o avlanguage.o \ + vorbiscomment.o wv.o OBJS-$(CONFIG_MD5_MUXER) += hashenc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o @@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ flacenc_header.o avlanguage.o \ - wv.o vorbiscomment.o \ - webmdashenc.o webm_chunk.o + wv.o vorbiscomment.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index f079c5c65e..1749509975 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -284,7 +284,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_CHUNK_MUXER static const AVClass webm_chunk_class = { .class_name = "WebM Chunk Muxer", .item_name = av_default_item_name, @@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = { .deinit = webm_chunk_deinit, .priv_class = &webm_chunk_class, }; -#endif diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 401cfe52d5..465485c90c 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -559,7 +559,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_DASH_MANIFEST_MUXER static const AVClass webm_dash_class = { .class_name = "WebM DASH Manifest muxer", .item_name = av_default_item_name, @@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { .write_packet = webm_dash_manifest_write_packet, .priv_class = &webm_dash_class, }; -#endif |