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

ffmpeg: add libopus support

Browse source 
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2014-08-28 13:16:59 -07:00
parent 28f8dfc928
commit ad20ef1147
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
multimedia/ffmpeg/Config.in
View file

@ -60,6 +60,7 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DECODER_ape select FFMPEG_CUSTOM_DECODER_ape
select FFMPEG_CUSTOM_DECODER_atrac3 select FFMPEG_CUSTOM_DECODER_atrac3
select FFMPEG_CUSTOM_DECODER_flac select FFMPEG_CUSTOM_DECODER_flac
select FFMPEG_CUSTOM_SELECT_libopus
select FFMPEG_CUSTOM_DECODER_mp2 select FFMPEG_CUSTOM_DECODER_mp2
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_DECODER_mpc7 select FFMPEG_CUSTOM_DECODER_mpc7
@ -108,6 +109,9 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
comment "External Libraries ---" comment "External Libraries ---"
config FFMPEG_CUSTOM_SELECT_libopus
bool "Opus"
config FFMPEG_CUSTOM_SELECT_speex config FFMPEG_CUSTOM_SELECT_speex
bool "Speex" bool "Speex"

11
multimedia/ffmpeg/Makefile
View file

@ -289,7 +289,7 @@ endef
define Package/libffmpeg-custom define Package/libffmpeg-custom
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (custom) TITLE+= (custom)
DEPENDS+= @DEVEL +libspeex DEPENDS+= @DEVEL +libopus +libspeex
VARIANT:=custom VARIANT:=custom
MENU:=1 MENU:=1
endef endef
@ -308,7 +308,7 @@ endef
define Package/libffmpeg-audio-dec define Package/libffmpeg-audio-dec
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (audio) TITLE+= (audio)
DEPENDS+= @DEVEL +libspeex DEPENDS+= @DEVEL +libopus +libspeex
VARIANT:=audio-dec VARIANT:=audio-dec
endef endef
@ -428,6 +428,12 @@ ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_adpcm),y)
endif endif
ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_libopus),y)
FFMPEG_CONFIGURE+= \
--enable-libopus --enable-decoder=libopus \
endif
ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_speex),y) ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_speex),y)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-libspeex --enable-decoder=libspeex \ --enable-libspeex --enable-decoder=libspeex \
@ -454,6 +460,7 @@ ifeq ($(BUILD_VARIANT),audio-dec)
$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
$(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \ $(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \
$(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
--enable-libopus --enable-decoder=libopus \
--enable-libspeex --enable-decoder=libspeex \ --enable-libspeex --enable-decoder=libspeex \
--disable-decoder=pcm_bluray,pcm_dvd \ --disable-decoder=pcm_bluray,pcm_dvd \