ffmpeg: let ffmpeg choose necessary parsers for audio-dec and custom

This change allows ffmpeg's configure script to determine the necessary parsers based on
selected decoders & encoders. For libffmpeg-audio-dec, this changes from our selecting:

aac, ac3, flac, mpegaudio, opus and aac_latm

to ffmpeg's configure script selecting:

aac_latm, ac3, flac, mpegaudio

for minor space savings and a simpler Makefile to manage on our end.

In libffmpeg-custom, don't select any parsers when choosing decoders/encoders. I'm undecided
on removing the parser selection in its entirety here.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index f1029a6c83bbeb965a40b93fa7e52fbe03da69e2..70c8ede24095d5d253b86ce178722435280b2c98 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -119,12 +119,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
        select FFMPEG_CUSTOM_DEMUXER_sdp
        select FFMPEG_CUSTOM_DEMUXER_wav
        select FFMPEG_CUSTOM_DEMUXER_wv
-       select FFMPEG_CUSTOM_PARSER_aac
-       select FFMPEG_CUSTOM_PARSER_aac_latm
-       select FFMPEG_CUSTOM_PARSER_ac3
-       select FFMPEG_CUSTOM_PARSER_flac
-       select FFMPEG_CUSTOM_PARSER_mpegaudio
-       select FFMPEG_CUSTOM_PARSER_opus
        select FFMPEG_CUSTOM_PROTOCOL_file
        select FFMPEG_CUSTOM_PROTOCOL_http
        select FFMPEG_CUSTOM_PROTOCOL_rtp
@@ -160,14 +154,12 @@ config FFMPEG_CUSTOM_SELECT_libx264
        select FFMPEG_CUSTOM_DECODER_h264
        select FFMPEG_CUSTOM_MUXER_h264
        select FFMPEG_CUSTOM_DEMUXER_h264
-       select FFMPEG_CUSTOM_PARSER_h264
 
 comment "Encoders"
 
 config FFMPEG_CUSTOM_ENCODER_ac3
        bool "AC3"
        depends on FFMPEG_CUSTOM_PATENTED
-       select FFMPEG_CUSTOM_PARSER_ac3
 
 config FFMPEG_CUSTOM_ENCODER_jpegls
        bool "JPEG-LS"
@@ -204,7 +196,6 @@ comment "Decoders"
 config FFMPEG_CUSTOM_DECODER_aac
        bool "AAC (Advanced Audio Coding)"
        depends on FFMPEG_CUSTOM_PATENTED
-       select FFMPEG_CUSTOM_PARSER_aac
 
 config FFMPEG_CUSTOM_SELECT_adpcm
        bool "ADPCM (multiple types)"
@@ -212,7 +203,6 @@ config FFMPEG_CUSTOM_SELECT_adpcm
 config FFMPEG_CUSTOM_DECODER_ac3
        bool "AC3"
        depends on FFMPEG_CUSTOM_PATENTED
-       select FFMPEG_CUSTOM_PARSER_ac3
 
 config FFMPEG_CUSTOM_DECODER_alac
        bool "ALAC"
@@ -234,7 +224,6 @@ config FFMPEG_CUSTOM_DECODER_atrac3
 
 config FFMPEG_CUSTOM_DECODER_flac
        bool "FLAC"
-       select FFMPEG_CUSTOM_PARSER_flac
 
 config FFMPEG_CUSTOM_DECODER_gif
        bool "GIF"
@@ -392,7 +381,6 @@ config FFMPEG_CUSTOM_DEMUXER_mov
 
 config FFMPEG_CUSTOM_DEMUXER_mp3
        bool "MP3 (MPEG Audio Layer 3)"
-       select FFMPEG_CUSTOM_PARSER_mpegaudio
 
 config FFMPEG_CUSTOM_DEMUXER_mpegvideo
        bool "MPEG Video"

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index b875b54ff0c481b4ba97a610c41cf448ff18ce98..4f58b717b267c44a88cb1bd97a73ef0e9dd2aa89 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -199,14 +199,6 @@ FFMPEG_AUDIO_DEMUXERS:= \
        wav \
        wv \
 
-FFMPEG_AUDIO_PARSERS:= \
-       aac \
-       aac_latm \
-       ac3 \
-       flac \
-       mpegaudio \
-       opus \
-
 FFMPEG_AUDIO_PROTOCOLS:= \
        file http icecast rtp tcp udp
 
@@ -549,7 +541,6 @@ ifeq ($(BUILD_VARIANT),audio-dec)
        --disable-everything \
        $(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \
        $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
-       $(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \
        $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
        --disable-decoder=pcm_bluray,pcm_dvd \