Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Ian Leonard 2017-08-08 00:06:04 -07:00
parent c2fa282431
commit 3998494f28
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
multimedia/ffmpeg/Config.in
View file

@ -119,12 +119,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_sdp select FFMPEG_CUSTOM_DEMUXER_sdp
select FFMPEG_CUSTOM_DEMUXER_wav select FFMPEG_CUSTOM_DEMUXER_wav
select FFMPEG_CUSTOM_DEMUXER_wv 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_file
select FFMPEG_CUSTOM_PROTOCOL_http select FFMPEG_CUSTOM_PROTOCOL_http
select FFMPEG_CUSTOM_PROTOCOL_rtp select FFMPEG_CUSTOM_PROTOCOL_rtp
@ -160,14 +154,12 @@ config FFMPEG_CUSTOM_SELECT_libx264
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_MUXER_h264 select FFMPEG_CUSTOM_MUXER_h264
select FFMPEG_CUSTOM_DEMUXER_h264 select FFMPEG_CUSTOM_DEMUXER_h264
select FFMPEG_CUSTOM_PARSER_h264
comment "Encoders" comment "Encoders"
config FFMPEG_CUSTOM_ENCODER_ac3 config FFMPEG_CUSTOM_ENCODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_ac3
config FFMPEG_CUSTOM_ENCODER_jpegls config FFMPEG_CUSTOM_ENCODER_jpegls
bool "JPEG-LS" bool "JPEG-LS"
@ -204,7 +196,6 @@ comment "Decoders"
config FFMPEG_CUSTOM_DECODER_aac config FFMPEG_CUSTOM_DECODER_aac
bool "AAC (Advanced Audio Coding)" bool "AAC (Advanced Audio Coding)"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_aac
config FFMPEG_CUSTOM_SELECT_adpcm config FFMPEG_CUSTOM_SELECT_adpcm
bool "ADPCM (multiple types)" bool "ADPCM (multiple types)"
@ -212,7 +203,6 @@ config FFMPEG_CUSTOM_SELECT_adpcm
config FFMPEG_CUSTOM_DECODER_ac3 config FFMPEG_CUSTOM_DECODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_ac3
config FFMPEG_CUSTOM_DECODER_alac config FFMPEG_CUSTOM_DECODER_alac
bool "ALAC" bool "ALAC"
@ -234,7 +224,6 @@ config FFMPEG_CUSTOM_DECODER_atrac3
config FFMPEG_CUSTOM_DECODER_flac config FFMPEG_CUSTOM_DECODER_flac
bool "FLAC" bool "FLAC"
select FFMPEG_CUSTOM_PARSER_flac
config FFMPEG_CUSTOM_DECODER_gif config FFMPEG_CUSTOM_DECODER_gif
bool "GIF" bool "GIF"
@ -392,7 +381,6 @@ config FFMPEG_CUSTOM_DEMUXER_mov
config FFMPEG_CUSTOM_DEMUXER_mp3 config FFMPEG_CUSTOM_DEMUXER_mp3
bool "MP3 (MPEG Audio Layer 3)" bool "MP3 (MPEG Audio Layer 3)"
select FFMPEG_CUSTOM_PARSER_mpegaudio
config FFMPEG_CUSTOM_DEMUXER_mpegvideo config FFMPEG_CUSTOM_DEMUXER_mpegvideo
bool "MPEG Video" bool "MPEG Video"

9
multimedia/ffmpeg/Makefile
View file

@ -199,14 +199,6 @@ FFMPEG_AUDIO_DEMUXERS:= \
wav \ wav \
wv \ wv \
FFMPEG_AUDIO_PARSERS:= \
aac \
aac_latm \
ac3 \
flac \
mpegaudio \
opus \
FFMPEG_AUDIO_PROTOCOLS:= \ FFMPEG_AUDIO_PROTOCOLS:= \
file http icecast rtp tcp udp file http icecast rtp tcp udp
@ -549,7 +541,6 @@ ifeq ($(BUILD_VARIANT),audio-dec)
--disable-everything \ --disable-everything \
$(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \
$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
$(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \
$(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
--disable-decoder=pcm_bluray,pcm_dvd \ --disable-decoder=pcm_bluray,pcm_dvd \