diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-07 21:25:48 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-14 18:11:01 +0200 |
| commit | 0c3faf8205066fb397e1f9f0e4de6b9571f3b95f (patch) | |
| tree | 7aaa69a68dbbdf47fbd2236fcf881a8bf8352f00 | |
| parent | 10a68ccd58318c00c7872081a0518acec7ebe6c3 (diff) | |
| download | ffmpeg-0c3faf8205066fb397e1f9f0e4de6b9571f3b95f.tar.gz | |
configure, libavformat/Makefile: Fix webm_chunk dependencies
The webm_chunk muxer requires the WebM muxer, yet it does not directly
require anything from libavformat/matroska.c (it does not even include
the corresponding header). So remove the dependency from the Makefile
and add a _select to configure.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -3336,6 +3336,7 @@ w64_demuxer_select="wav_demuxer" w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" +webm_chunk_muxer_select="webm_muxer" webm_muxer_select="iso_media riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" diff --git a/libavformat/Makefile b/libavformat/Makefile index 9d4c230bcf..f72fa6fb1a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -555,7 +555,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ wv.o vorbiscomment.o \ webmdashenc.o webm_chunk.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o matroska.o -OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o matroska.o +OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o |