ffmpeg: libffmpeg-audio-dec and -custom use integrated opus decoder

For libffmpeg-audio-dec:

Remove @DEVEL flag from libffmpeg-audio-dec. Reasoning for this is
that choosing this package does not rquire any further action by the
builder in what codecs or formats should be built in.
libffmpeg-custom, the other libffmpeg to require @DEVEL, does need
further interaction.

Add @BUILD_PATENTED as at least one of the audio codecs is likely
patent protected.

Add ffmpeg's native Opus decoder to libffmpeg-audio-dec

Remove libopus dependency to libffmpeg-audio-dec as libopus provides
decode and encode support for Opus audio. Since FFmpeg can decode
Opus audio on its own, and libffmpeg-audio-dec is intended for audio
decoding, libopus is no longer required for Opus audio support.

For libffmpeg-custom:

Add in options for ffmpeg's integrated Opus decoder

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard
2015-05-19 23:48:24 -07:00
parent 5fa4fc4884
commit ae13b1441d
2 changed files with 14 additions and 6 deletions
+9 -2
View File
@@ -60,11 +60,11 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DECODER_ape
select FFMPEG_CUSTOM_DECODER_atrac3
select FFMPEG_CUSTOM_DECODER_flac
select FFMPEG_CUSTOM_SELECT_libopus
select FFMPEG_CUSTOM_DECODER_mp2
select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_DECODER_mpc7
select FFMPEG_CUSTOM_DECODER_mpc8
select FFMPEG_CUSTOM_DECODER_opus
select FFMPEG_CUSTOM_DECODER_pcm_s16be
select FFMPEG_CUSTOM_DECODER_pcm_s16le
select FFMPEG_CUSTOM_SELECT_speex
@@ -98,9 +98,10 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_wv
select FFMPEG_CUSTOM_PARSER_aac
select FFMPEG_CUSTOM_PARSER_aac_latm
select FFMPEG_CUSTOM_PARSER_flac
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
@@ -229,6 +230,9 @@ config FFMPEG_CUSTOM_DECODER_mpc8
bool "Musepack 8"
select FFMPEG_CUSTOM_DEMUXER_mpc8
config FFMPEG_CUSTOM_DECODER_opus
bool "Opus"
config FFMPEG_CUSTOM_DECODER_pcm_s16be
bool "PCM signed 16-bit big-endian"
@@ -398,6 +402,9 @@ config FFMPEG_CUSTOM_PARSER_mpegvideo
config FFMPEG_CUSTOM_PARSER_mpeg4video
bool "MPEG-4 Video"
config FFMPEG_CUSTOM_PARSER_opus
bool "Opus"
comment "Protocols ---"
config FFMPEG_CUSTOM_PROTOCOL_file