cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Update to 2.8.7. Add support for x264 and libmp3lame

Browse Source 
Add support for libmp3lame & libx264 to 'full' and optional in 'custom'.
Enable some optimizations according to ARCH and CPU type.
Cleaup options and dependencies.

Signed-off-by: Adrian Panella <ianchi74@outlook.com>
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Adrian Panella
2016-05-15 21:05:49 -05:00
committed by Ted Hess
parent 630a41fd05
commit 3f124e2b8e
2 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/ffmpeg/Config.in
+26 -11
View File
@@ -1,11 +1,10 @@
menu "Configuration"
depends on PACKAGE_libffmpeg-custom
if PACKAGE_libffmpeg-custom
config FFMPEG_CUSTOM_PATENTED
bool "Include patented codecs and technologies"
default BUILD_PATENTED
comment "Profiles ---"
comment "Profiles"
config FFMPEG_CUSTOM_FFSERVER_SUPPORT
bool "Include support for ffserver (FFmpeg streaming server)"
@@ -68,6 +67,7 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DECODER_pcm_s16be
select FFMPEG_CUSTOM_DECODER_pcm_s16le
select FFMPEG_CUSTOM_SELECT_speex
select FFMPEG_CUSTOM_SELECT_libopus
select FFMPEG_CUSTOM_DECODER_vorbis
select FFMPEG_CUSTOM_DECODER_wavpack
select FFMPEG_CUSTOM_DECODER_wmav1
@@ -108,7 +108,14 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_PROTOCOL_tcp
select FFMPEG_CUSTOM_PROTOCOL_udp
comment "External Libraries ---"
comment "External Libraries"
config FFMPEG_CUSTOM_SELECT_mp3lame
bool "MP3 LAME"
depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_MUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mp3
config FFMPEG_CUSTOM_SELECT_libopus
bool "Opus"
@@ -116,7 +123,15 @@ config FFMPEG_CUSTOM_SELECT_libopus
config FFMPEG_CUSTOM_SELECT_speex
bool "Speex"
comment "Encoders ---"
config FFMPEG_CUSTOM_SELECT_x264
depends on FFMPEG_CUSTOM_PATENTED
bool "x264"
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"
@@ -153,7 +168,7 @@ config FFMPEG_CUSTOM_ENCODER_vorbis
config FFMPEG_CUSTOM_ENCODER_zlib
bool "Zlib"
comment "Decoders ---"
comment "Decoders"
config FFMPEG_CUSTOM_DECODER_aac
bool "AAC (Advanced Audio Coding)"
@@ -261,7 +276,7 @@ config FFMPEG_CUSTOM_DECODER_wmav2
config FFMPEG_CUSTOM_DECODER_zlib
bool "Zlib"
comment "Muxers ---"
comment "Muxers"
config FFMPEG_CUSTOM_MUXER_ac3
bool "AC3"
@@ -295,7 +310,7 @@ config FFMPEG_CUSTOM_MUXER_ogg
config FFMPEG_CUSTOM_MUXER_rtp
bool "RTP"
comment "Demuxers ---"
comment "Demuxers"
config FFMPEG_CUSTOM_DEMUXER_aac
bool "AAC"
@@ -376,7 +391,7 @@ config FFMPEG_CUSTOM_DEMUXER_wav
config FFMPEG_CUSTOM_DEMUXER_wv
bool "WV"
comment "Parsers ---"
comment "Parsers"
config FFMPEG_CUSTOM_PARSER_aac
bool "AAC (Advanced Audio Coding)"
@@ -405,7 +420,7 @@ config FFMPEG_CUSTOM_PARSER_mpeg4video
config FFMPEG_CUSTOM_PARSER_opus
bool "Opus"
comment "Protocols ---"
comment "Protocols"
config FFMPEG_CUSTOM_PROTOCOL_file
bool "file:"
@@ -430,5 +445,5 @@ config FFMPEG_CUSTOM_PROTOCOL_tcp
config FFMPEG_CUSTOM_PROTOCOL_udp
bool "udp:"
endmenu
endif