diff mbox series

[FFmpeg-devel,02/10] configure, libavformat/Makefile: Fix webm_chunk dependencies

Message ID 20200407214603.19798-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 0c3faf8205066fb397e1f9f0e4de6b9571f3b95f
Headers show
Series [FFmpeg-devel] avformat/Makefile: Add missing rawenc dependency for iLBC muxer
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Andreas Rheinhardt April 7, 2020, 9:45 p.m. UTC
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>
---
 configure            | 1 +
 libavformat/Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Andreas Rheinhardt April 13, 2020, 8:57 p.m. UTC | #1
Andreas Rheinhardt:
> 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>
> ---
>  configure            | 1 +
>  libavformat/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 09bda9b408..2f08d06af7 100755
> --- a/configure
> +++ b/configure
> @@ -3335,6 +3335,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
> 
If no one objects, I'll apply the rest of this patchset tomorrow.

- Andreas
Andreas Rheinhardt April 14, 2020, 6:05 p.m. UTC | #2
Andreas Rheinhardt:
> Andreas Rheinhardt:
>> 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>
>> ---
>>  configure            | 1 +
>>  libavformat/Makefile | 2 +-
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 09bda9b408..2f08d06af7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -3335,6 +3335,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
>>
> If no one objects, I'll apply the rest of this patchset tomorrow.
> 
> - Andreas
> 
Applied.

- Andreas
diff mbox series

Patch

diff --git a/configure b/configure
index 09bda9b408..2f08d06af7 100755
--- a/configure
+++ b/configure
@@ -3335,6 +3335,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