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 /libavformat/Makefile | |
| parent | a51d1b3634e11c8d92acbf8b7e88585d5de07575 (diff) | |
| download | ffmpeg-0c0a1d73c2310ffe52a6545a860f2e1e19e06578.tar.gz | |
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>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 7 |
1 files changed, 3 insertions, 4 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 |