diff mbox

[FFmpeg-devel,1/5] configure: Add missing muxer BSF dependencies

Message ID 20181004230947.9658-1-sw@jkqxz.net
State New
Headers show

Commit Message

Mark Thompson Oct. 4, 2018, 11:09 p.m. UTC
---
 configure | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

James Almer Oct. 4, 2018, 11:53 p.m. UTC | #1
On 10/4/2018 8:09 PM, Mark Thompson wrote:
> ---
>  configure | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 85d5dd5962..cbd52e641b 100755
> --- a/configure
> +++ b/configure
> @@ -3173,26 +3173,30 @@ eac3_demuxer_select="ac3_parser"
>  f4v_muxer_select="mov_muxer"
>  fifo_muxer_deps="threads"
>  flac_demuxer_select="flac_parser"
> +h264_muxer_select="h264_mp4toannexb_bsf"
>  hds_muxer_select="flv_muxer"
> +hevc_muxer_select="hevc_mp4toannexb_bsf"
>  hls_muxer_select="mpegts_muxer"
>  hls_muxer_suggest="gcrypt openssl"
>  image2_alias_pix_demuxer_select="image2_demuxer"
>  image2_brender_pix_demuxer_select="image2_demuxer"
>  ipod_muxer_select="mov_muxer"
>  ismv_muxer_select="mov_muxer"
> +ivf_muxer_select="vp9_superframe_bsf"
> +latm_muxer_select="aac_adtstoasc_bsf"
>  matroska_audio_muxer_select="matroska_muxer"
>  matroska_demuxer_select="iso_media riffdec"
>  matroska_demuxer_suggest="bzlib lzo zlib"
> -matroska_muxer_select="iso_media riffenc"
> +matroska_muxer_select="iso_media riffenc aac_adtstoasc_bsf vp9_superframe_bsf"
>  mmf_muxer_select="riffenc"
>  mov_demuxer_select="iso_media riffdec"
>  mov_demuxer_suggest="zlib"
> -mov_muxer_select="iso_media riffenc rtpenc_chain"
> +mov_muxer_select="iso_media riffenc rtpenc_chain aac_adtstoasc_bsf"
>  mp3_demuxer_select="mpegaudio_parser"
>  mp3_muxer_select="mpegaudioheader"
>  mp4_muxer_select="mov_muxer"
>  mpegts_demuxer_select="iso_media"
> -mpegts_muxer_select="adts_muxer latm_muxer"
> +mpegts_muxer_select="adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf"
>  mpegtsraw_demuxer_select="mpegts_demuxer"
>  mxf_d10_muxer_select="mxf_muxer"
>  mxf_opatom_muxer_select="mxf_muxer"

I don't think enabling any of the *_mp4toannexb_bsf or aac_adtstoasc_bsf
is a good idea for mov, matroska, mpegts and similar. Nothing says
whoever is configuring/building ffmpeg wants to mux such codecs into
those containers, so why force enable bsfs they don't care about?
latm, h264 and hevc are the exception, seeing they require the bsfs to
actually work, and at least the latter two don't seem to reject any
packet you pass to them.

vp9_superframe_bsf is a different story since that one prevents muxing
invalid bitstreams, and should indeed be always enabled.
diff mbox

Patch

diff --git a/configure b/configure
index 85d5dd5962..cbd52e641b 100755
--- a/configure
+++ b/configure
@@ -3173,26 +3173,30 @@  eac3_demuxer_select="ac3_parser"
 f4v_muxer_select="mov_muxer"
 fifo_muxer_deps="threads"
 flac_demuxer_select="flac_parser"
+h264_muxer_select="h264_mp4toannexb_bsf"
 hds_muxer_select="flv_muxer"
+hevc_muxer_select="hevc_mp4toannexb_bsf"
 hls_muxer_select="mpegts_muxer"
 hls_muxer_suggest="gcrypt openssl"
 image2_alias_pix_demuxer_select="image2_demuxer"
 image2_brender_pix_demuxer_select="image2_demuxer"
 ipod_muxer_select="mov_muxer"
 ismv_muxer_select="mov_muxer"
+ivf_muxer_select="vp9_superframe_bsf"
+latm_muxer_select="aac_adtstoasc_bsf"
 matroska_audio_muxer_select="matroska_muxer"
 matroska_demuxer_select="iso_media riffdec"
 matroska_demuxer_suggest="bzlib lzo zlib"
-matroska_muxer_select="iso_media riffenc"
+matroska_muxer_select="iso_media riffenc aac_adtstoasc_bsf vp9_superframe_bsf"
 mmf_muxer_select="riffenc"
 mov_demuxer_select="iso_media riffdec"
 mov_demuxer_suggest="zlib"
-mov_muxer_select="iso_media riffenc rtpenc_chain"
+mov_muxer_select="iso_media riffenc rtpenc_chain aac_adtstoasc_bsf"
 mp3_demuxer_select="mpegaudio_parser"
 mp3_muxer_select="mpegaudioheader"
 mp4_muxer_select="mov_muxer"
 mpegts_demuxer_select="iso_media"
-mpegts_muxer_select="adts_muxer latm_muxer"
+mpegts_muxer_select="adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf"
 mpegtsraw_demuxer_select="mpegts_demuxer"
 mxf_d10_muxer_select="mxf_muxer"
 mxf_opatom_muxer_select="mxf_muxer"