LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #195 from antonlacon/ffmpeg-2.3.x 

ffmpeg: Update to 2.3.1 and other cleanup
lilik-openwrt-22.03
Ted Hess 11 years ago
parent
ef6c65077e 8bbe2c06fa
commit
ea2970aa72
2 changed files with 106 additions and 57 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +67
    -19
      multimedia/ffmpeg/Config.in
  2. +39
    -38
      multimedia/ffmpeg/Makefile

+ 67
- 19
multimedia/ffmpeg/Config.in View File

@ -14,11 +14,12 @@ config FFMPEG_CUSTOM_FFSERVER_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_rtsp select FFMPEG_CUSTOM_DEMUXER_rtsp
select FFMPEG_CUSTOM_PROTOCOL_rtp select FFMPEG_CUSTOM_PROTOCOL_rtp
config FFMPEG_CUSTOM_LIBDLNA_SUPPORT
bool "Include support for libdlna/ushare"
config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
bool "Include support for minidlna"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_aac
select FFMPEG_CUSTOM_DECODER_ac3 select FFMPEG_CUSTOM_DECODER_ac3
select FFMPEG_CUSTOM_DECODER_atrac3
select FFMPEG_CUSTOM_DECODER_flac
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_DECODER_jpegls select FFMPEG_CUSTOM_DECODER_jpegls
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
@ -26,40 +27,89 @@ config FFMPEG_CUSTOM_LIBDLNA_SUPPORT
select FFMPEG_CUSTOM_DECODER_mpeg2video select FFMPEG_CUSTOM_DECODER_mpeg2video
select FFMPEG_CUSTOM_DECODER_mpeg4 select FFMPEG_CUSTOM_DECODER_mpeg4
select FFMPEG_CUSTOM_DECODER_mpegvideo select FFMPEG_CUSTOM_DECODER_mpegvideo
select FFMPEG_CUSTOM_DECODER_png
select FFMPEG_CUSTOM_DECODER_wmav1 select FFMPEG_CUSTOM_DECODER_wmav1
select FFMPEG_CUSTOM_DECODER_wmav2 select FFMPEG_CUSTOM_DECODER_wmav2
select FFMPEG_CUSTOM_DECODER_png
select FFMPEG_CUSTOM_DEMUXER_aac
select FFMPEG_CUSTOM_DEMUXER_ac3 select FFMPEG_CUSTOM_DEMUXER_ac3
select FFMPEG_CUSTOM_DEMUXER_avi
select FFMPEG_CUSTOM_DEMUXER_flac
select FFMPEG_CUSTOM_DEMUXER_h264 select FFMPEG_CUSTOM_DEMUXER_h264
select FFMPEG_CUSTOM_DEMUXER_matroska
select FFMPEG_CUSTOM_DEMUXER_mov
select FFMPEG_CUSTOM_DEMUXER_mp3 select FFMPEG_CUSTOM_DEMUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mpegts
select FFMPEG_CUSTOM_DEMUXER_mpegvideo select FFMPEG_CUSTOM_DEMUXER_mpegvideo
select FFMPEG_CUSTOM_PARSER_ac3
select FFMPEG_CUSTOM_PARSER_flac
select FFMPEG_CUSTOM_PARSER_h264
select FFMPEG_CUSTOM_PARSER_mpeg4video
select FFMPEG_CUSTOM_PARSER_mpegaudio
select FFMPEG_CUSTOM_PROTOCOL_file
config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
bool "Include support for minidlna"
config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
bool "Include support for most audio decoding requirements"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_aac select FFMPEG_CUSTOM_DECODER_aac
select FFMPEG_CUSTOM_DECODER_aac_latm
select FFMPEG_CUSTOM_DECODER_ac3 select FFMPEG_CUSTOM_DECODER_ac3
select FFMPEG_CUSTOM_SELECT_adpcm
select FFMPEG_CUSTOM_DECODER_alac
select FFMPEG_CUSTOM_DECODER_amrnb
select FFMPEG_CUSTOM_DECODER_amrwb
select FFMPEG_CUSTOM_DECODER_ape
select FFMPEG_CUSTOM_DECODER_atrac3
select FFMPEG_CUSTOM_DECODER_flac select FFMPEG_CUSTOM_DECODER_flac
select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_DECODER_jpegls
select FFMPEG_CUSTOM_DECODER_mp2
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_DECODER_mpeg1video
select FFMPEG_CUSTOM_DECODER_mpeg2video
select FFMPEG_CUSTOM_DECODER_mpeg4
select FFMPEG_CUSTOM_DECODER_mpegvideo
select FFMPEG_CUSTOM_DECODER_mpc7
select FFMPEG_CUSTOM_DECODER_mpc8
select FFMPEG_CUSTOM_DECODER_pcm_s16be
select FFMPEG_CUSTOM_DECODER_pcm_s16le
select FFMPEG_CUSTOM_SELECT_speex
select FFMPEG_CUSTOM_DECODER_vorbis
select FFMPEG_CUSTOM_DECODER_wavpack
select FFMPEG_CUSTOM_DECODER_wmav1 select FFMPEG_CUSTOM_DECODER_wmav1
select FFMPEG_CUSTOM_DECODER_wmav2 select FFMPEG_CUSTOM_DECODER_wmav2
select FFMPEG_CUSTOM_DECODER_png
select FFMPEG_CUSTOM_DECODER_wmalossless
select FFMPEG_CUSTOM_DECODER_wmapro
select FFMPEG_CUSTOM_DECODER_zlib
select FFMPEG_CUSTOM_DEMUXER_aac select FFMPEG_CUSTOM_DEMUXER_aac
select FFMPEG_CUSTOM_DEMUXER_ac3 select FFMPEG_CUSTOM_DEMUXER_ac3
select FFMPEG_CUSTOM_DEMUXER_aiff
select FFMPEG_CUSTOM_DEMUXER_amr
select FFMPEG_CUSTOM_DEMUXER_ape
select FFMPEG_CUSTOM_DEMUXER_avi select FFMPEG_CUSTOM_DEMUXER_avi
select FFMPEG_CUSTOM_DEMUXER_flac select FFMPEG_CUSTOM_DEMUXER_flac
select FFMPEG_CUSTOM_DEMUXER_h264
select FFMPEG_CUSTOM_DEMUXER_ffm
select FFMPEG_CUSTOM_DEMUXER_matroska select FFMPEG_CUSTOM_DEMUXER_matroska
select FFMPEG_CUSTOM_DEMUXER_mov
select FFMPEG_CUSTOM_DEMUXER_mp3 select FFMPEG_CUSTOM_DEMUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mpegvideo
select FFMPEG_CUSTOM_DEMUXER_mov
select FFMPEG_CUSTOM_DEMUXER_mpc
select FFMPEG_CUSTOM_DEMUXER_mpc8
select FFMPEG_CUSTOM_DEMUXER_mpegts
select FFMPEG_CUSTOM_DEMUXER_ogg
select FFMPEG_CUSTOM_DEMUXER_rm
select FFMPEG_CUSTOM_DEMUXER_rtsp
select FFMPEG_CUSTOM_DEMUXER_rtp
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_flac
select FFMPEG_CUSTOM_PARSER_ac3
select FFMPEG_CUSTOM_PARSER_mpegaudio
select FFMPEG_CUSTOM_PROTOCOL_file select FFMPEG_CUSTOM_PROTOCOL_file
select FFMPEG_CUSTOM_PROTOCOL_http
select FFMPEG_CUSTOM_PROTOCOL_rtp
select FFMPEG_CUSTOM_PROTOCOL_tcp
select FFMPEG_CUSTOM_PROTOCOL_udp
comment "External Libraries ---"
config FFMPEG_CUSTOM_SELECT_speex
bool "Speex"
comment "Encoders ---" comment "Encoders ---"
@ -185,11 +235,9 @@ config FFMPEG_CUSTOM_DECODER_png
bool "PNG" bool "PNG"
select FFMPEG_CUSTOM_DECODER_zlib select FFMPEG_CUSTOM_DECODER_zlib
config FFMPEG_CUSTOM_SELECT_speex
bool "Speex"
config FFMPEG_CUSTOM_DECODER_vorbis config FFMPEG_CUSTOM_DECODER_vorbis
bool "Vorbis" bool "Vorbis"
select FFMPEG_CUSTOM_DEMUXER_ogg
config FFMPEG_CUSTOM_DECODER_wavpack config FFMPEG_CUSTOM_DECODER_wavpack
bool "Wavpack" bool "Wavpack"


+ 39
- 38
multimedia/ffmpeg/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=0.11.5
PKG_RELEASE:=5
PKG_VERSION:=2.3.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ffmpeg.org/releases/ PKG_SOURCE_URL:=http://ffmpeg.org/releases/
PKG_MD5SUM:=ea25fc252c132141f12988ed5506bfe8
PKG_MD5SUM:=bb02e99c39941d7f3dc56658b9324a2b
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3 PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
@ -110,14 +110,10 @@ FFMPEG_CUSTOM_PARSERS:= \
FFMPEG_CUSTOM_PROTOCOLS:= \ FFMPEG_CUSTOM_PROTOCOLS:= \
file http pipe rtp tcp udp file http pipe rtp tcp udp
FFMPEG_MINI_ENCODERS:= \
FFMPEG_MINI_DECODERS:= \ FFMPEG_MINI_DECODERS:= \
aac \ aac \
ac3 \ ac3 \
atrac3 \
flac \ flac \
h263 \
h264 \ h264 \
jpegls \ jpegls \
mp3 \ mp3 \
@ -129,15 +125,10 @@ FFMPEG_MINI_DECODERS:= \
wmav1 \ wmav1 \
wmav2 \ wmav2 \
FFMPEG_MINI_MUXERS:= \
ffm \
FFMPEG_MINI_DEMUXERS := \ FFMPEG_MINI_DEMUXERS := \
aac \ aac \
ac3 \ ac3 \
asf \
avi \ avi \
ffm \
flac \ flac \
h264 \ h264 \
matroska \ matroska \
@ -145,19 +136,16 @@ FFMPEG_MINI_DEMUXERS := \
mp3 \ mp3 \
mpegts \ mpegts \
mpegvideo \ mpegvideo \
sdp \
rtsp \
FFMPEG_MINI_PARSERS:= \ FFMPEG_MINI_PARSERS:= \
ac3 \ ac3 \
flac \ flac \
h263 \
h264 \ h264 \
mpeg4video \ mpeg4video \
mpegaudio \ mpegaudio \
FFMPEG_MINI_PROTOCOLS := \ FFMPEG_MINI_PROTOCOLS := \
file http rtp tcp udp \
file \
FFMPEG_AUDIO_DECODERS:= \ FFMPEG_AUDIO_DECODERS:= \
aac \ aac \
@ -368,23 +356,47 @@ FFMPEG_CONFIGURE:= \
--arch="$(ARCH)" \ --arch="$(ARCH)" \
--target-os=linux \ --target-os=linux \
--prefix="/usr" \ --prefix="/usr" \
--pkg-config="pkg-config" \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--enable-small \
--enable-pthreads \
--enable-zlib \
--disable-runtime-cpudetect \
--disable-doc \
--disable-debug \ --disable-debug \
--pkg-config="pkg-config" \
\ \
--enable-gpl \ --enable-gpl \
--enable-version3 \ --enable-version3 \
\ \
--disable-altivec \ --disable-altivec \
--disable-asm \
--disable-doc \
--disable-amd3dnow \
--disable-amd3dnowext \
--disable-mmx \
--disable-mmxext \
--disable-sse \
--disable-sse2 \
--disable-sse3 \
--disable-ssse3 \
--disable-sse4 \
--disable-sse42 \
--disable-avx \
--disable-xop \
--disable-fma3 \
--disable-fma4 \
--disable-avx2 \
--disable-vfp \
--disable-neon \
--disable-inline-asm \
--disable-yasm \
--disable-mipsdspr1 \
--disable-mipsdspr2 \
--disable-mipsfpu \
\
--disable-dxva2 \ --disable-dxva2 \
--enable-pthreads \
--disable-optimizations \
--enable-small \
--disable-stripping \
--enable-zlib \
--disable-vaapi \
--disable-vda \
--disable-vdpau \
--disable-outdevs --disable-outdevs
ifeq ($(BUILD_VARIANT),custom) ifeq ($(BUILD_VARIANT),custom)
@ -395,10 +407,7 @@ ifeq ($(BUILD_VARIANT),custom)
) )
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--disable-ffmpeg \
--disable-ffplay \
--disable-ffprobe \
--disable-ffserver \
--disable-programs \
--disable-avfilter \ --disable-avfilter \
--disable-postproc \ --disable-postproc \
--disable-swresample \ --disable-swresample \
@ -435,10 +444,7 @@ ifeq ($(BUILD_VARIANT),audio-dec)
) )
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--disable-ffmpeg \
--disable-ffplay \
--disable-ffprobe \
--disable-ffserver \
--disable-programs \
--disable-avfilter \ --disable-avfilter \
--disable-postproc \ --disable-postproc \
--disable-swresample \ --disable-swresample \
@ -461,19 +467,14 @@ ifeq ($(BUILD_VARIANT),mini)
) )
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--disable-ffmpeg \
--disable-ffplay \
--disable-ffprobe \
--disable-ffserver \
--disable-programs \
--disable-avdevice \ --disable-avdevice \
--disable-avfilter \ --disable-avfilter \
--disable-postproc \ --disable-postproc \
--disable-swresample \ --disable-swresample \
--disable-swscale \ --disable-swscale \
--disable-everything \ --disable-everything \
$(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \
$(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \
$(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \
$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \
$(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \ $(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \
$(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \


Write Preview
Loading…
Cancel
Save