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

ffmpeg: Update 2.8.8, add codecs, update dlna profile, correct libopus use 

Update ffmpeg to 2.8.8.

Adds HEVC, Opus, VC-1 and Vorbis to custom and minidlna profiles. This should
more closely match formats media being streamed on the local network via
DLNA/UPNP.

Removes raw aac, ac3 and h264 from minidlna profile. Most players expect
this content to come within a container (mkv, mov, mp4, mpegts, etc...),
so this was unnecessary for the profile's goals.

Remove libopus from being selected by the -custom's audio-dec profile, and as
a depend on -audio-dec. -audio-dec uses ffmpeg's internal Opus decoder, not
the external library.

Don't select specific parsers in libffmpeg-mini profile. The demuxers separate
streams from containers. Parsers break up the streams. These are not needed
for DLNA/UPNP. If a parser is needed, the ffmpeg configure script should grab
it.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
lilik-openwrt-22.03
Ian Leonard 8 years ago
parent
7d8b40445a
commit
3b624ce56e
2 changed files with 53 additions and 26 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +37
    -11
      multimedia/ffmpeg/Config.in
  2. +16
    -15
      multimedia/ffmpeg/Makefile

+ 37
- 11
multimedia/ffmpeg/Config.in View File

@ -20,6 +20,7 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
select FFMPEG_CUSTOM_DECODER_ac3 select FFMPEG_CUSTOM_DECODER_ac3
select FFMPEG_CUSTOM_DECODER_flac select FFMPEG_CUSTOM_DECODER_flac
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_DECODER_hevc
select FFMPEG_CUSTOM_DECODER_jpegls select FFMPEG_CUSTOM_DECODER_jpegls
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_DECODER_mpeg1video select FFMPEG_CUSTOM_DECODER_mpeg1video
@ -27,23 +28,19 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
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_png
select FFMPEG_CUSTOM_DECODER_opus
select FFMPEG_CUSTOM_DECODER_vc1
select FFMPEG_CUSTOM_DECODER_vorbis
select FFMPEG_CUSTOM_DECODER_wmav1 select FFMPEG_CUSTOM_DECODER_wmav1
select FFMPEG_CUSTOM_DECODER_wmav2 select FFMPEG_CUSTOM_DECODER_wmav2
select FFMPEG_CUSTOM_DEMUXER_aac
select FFMPEG_CUSTOM_DEMUXER_ac3
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_matroska select FFMPEG_CUSTOM_DEMUXER_matroska
select FFMPEG_CUSTOM_DEMUXER_mov select FFMPEG_CUSTOM_DEMUXER_mov
select FFMPEG_CUSTOM_DEMUXER_mp3 select FFMPEG_CUSTOM_DEMUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mpegts 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_DEMUXER_ogg
select FFMPEG_CUSTOM_PROTOCOL_file select FFMPEG_CUSTOM_PROTOCOL_file
config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
@ -67,7 +64,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DECODER_pcm_s16be select FFMPEG_CUSTOM_DECODER_pcm_s16be
select FFMPEG_CUSTOM_DECODER_pcm_s16le select FFMPEG_CUSTOM_DECODER_pcm_s16le
select FFMPEG_CUSTOM_SELECT_speex select FFMPEG_CUSTOM_SELECT_speex
select FFMPEG_CUSTOM_SELECT_libopus
select FFMPEG_CUSTOM_DECODER_vorbis select FFMPEG_CUSTOM_DECODER_vorbis
select FFMPEG_CUSTOM_DECODER_wavpack select FFMPEG_CUSTOM_DECODER_wavpack
select FFMPEG_CUSTOM_DECODER_wmav1 select FFMPEG_CUSTOM_DECODER_wmav1
@ -214,6 +210,10 @@ config FFMPEG_CUSTOM_DECODER_h264
bool "H.264" bool "H.264"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_hevc
bool "HEVC / H.265 Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_jpegls config FFMPEG_CUSTOM_DECODER_jpegls
bool "JPEG-LS" bool "JPEG-LS"
@ -260,6 +260,10 @@ config FFMPEG_CUSTOM_DECODER_png
bool "PNG" bool "PNG"
select FFMPEG_CUSTOM_DECODER_zlib select FFMPEG_CUSTOM_DECODER_zlib
config FFMPEG_CUSTOM_DECODER_vc1
bool "VC-1 / WMV9"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_vorbis config FFMPEG_CUSTOM_DECODER_vorbis
bool "Vorbis" bool "Vorbis"
select FFMPEG_CUSTOM_DEMUXER_ogg select FFMPEG_CUSTOM_DEMUXER_ogg
@ -288,7 +292,11 @@ config FFMPEG_CUSTOM_MUXER_ffm
bool "FFM (ffserver live feed)" bool "FFM (ffserver live feed)"
config FFMPEG_CUSTOM_MUXER_h264 config FFMPEG_CUSTOM_MUXER_h264
bool "H.264"
bool "H.264 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_MUXER_hevc
bool "HEVC / H265 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_MUXER_mp3 config FFMPEG_CUSTOM_MUXER_mp3
@ -336,7 +344,11 @@ config FFMPEG_CUSTOM_DEMUXER_ffm
bool "FFM (ffserver live feed)" bool "FFM (ffserver live feed)"
config FFMPEG_CUSTOM_DEMUXER_h264 config FFMPEG_CUSTOM_DEMUXER_h264
bool "H.264"
bool "H.264 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DEMUXER_hevc
bool "HEVC / H265 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DEMUXER_matroska config FFMPEG_CUSTOM_DEMUXER_matroska
@ -387,6 +399,10 @@ config FFMPEG_CUSTOM_DEMUXER_sdp
config FFMPEG_CUSTOM_DEMUXER_rtp config FFMPEG_CUSTOM_DEMUXER_rtp
bool "RTP" bool "RTP"
config FFMPEG_CUSTOM_DEMUXER_vc1
bool "VC-1 / WMV9 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DEMUXER_wav config FFMPEG_CUSTOM_DEMUXER_wav
bool "WAV" bool "WAV"
@ -410,6 +426,11 @@ config FFMPEG_CUSTOM_PARSER_h264
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
config FFMPEG_CUSTOM_PARSER_hevc
bool "HEVC / H265"
depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_hevc
config FFMPEG_CUSTOM_PARSER_mpegaudio config FFMPEG_CUSTOM_PARSER_mpegaudio
bool "MPEG Audio" bool "MPEG Audio"
@ -422,6 +443,11 @@ config FFMPEG_CUSTOM_PARSER_mpeg4video
config FFMPEG_CUSTOM_PARSER_opus config FFMPEG_CUSTOM_PARSER_opus
bool "Opus" bool "Opus"
config FFMPEG_CUSTOM_PARSER_vc1
bool "VC-1 / WMV9"
depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_DECODER_vc1
comment "Protocols" comment "Protocols"
config FFMPEG_CUSTOM_PROTOCOL_file config FFMPEG_CUSTOM_PROTOCOL_file


+ 16
- 15
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:=2.8.7
PKG_RELEASE:=3
PKG_VERSION:=2.8.8
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ffmpeg.org/releases/ PKG_SOURCE_URL:=http://ffmpeg.org/releases/
PKG_MD5SUM:=7e5b1c98eedfc3a364fa8c4095deeae5
PKG_MD5SUM:=5fae1ba5a5d37a2d0de750479b7270d4
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
@ -42,6 +42,7 @@ FFMPEG_CUSTOM_DECODERS:= \
flac \ flac \
gif \ gif \
h264 \ h264 \
hevc \
jpegls \ jpegls \
mp2 \ mp2 \
mp3 \ mp3 \
@ -54,6 +55,7 @@ FFMPEG_CUSTOM_DECODERS:= \
pcm_s16be \ pcm_s16be \
pcm_s16le \ pcm_s16le \
png \ png \
vc1 \
vorbis \ vorbis \
wavpack \ wavpack \
wmav1 \ wmav1 \
@ -64,6 +66,7 @@ FFMPEG_CUSTOM_MUXERS:= \
ac3 \ ac3 \
ffm \ ffm \
h264 \ h264 \
hevc \
mp3 \ mp3 \
mp4 \ mp4 \
mpeg1video \ mpeg1video \
@ -81,6 +84,7 @@ FFMPEG_CUSTOM_DEMUXERS:= \
flac \ flac \
ffm \ ffm \
h264 \ h264 \
hevc \
matroska \ matroska \
mov \ mov \
mp3 \ mp3 \
@ -95,6 +99,7 @@ FFMPEG_CUSTOM_DEMUXERS:= \
rtp \ rtp \
sdp \ sdp \
v4l2 \ v4l2 \
vc1 \
wav \ wav \
wv \ wv \
@ -103,9 +108,11 @@ FFMPEG_CUSTOM_PARSERS:= \
flac \ flac \
ac3 \ ac3 \
h264 \ h264 \
hevc \
mpegaudio \ mpegaudio \
mpeg4video \ mpeg4video \
mpegvideo \ mpegvideo \
vc1 \
FFMPEG_CUSTOM_PROTOCOLS:= \ FFMPEG_CUSTOM_PROTOCOLS:= \
file http icecast pipe rtp tcp udp file http icecast pipe rtp tcp udp
@ -115,34 +122,29 @@ FFMPEG_MINI_DECODERS:= \
ac3 \ ac3 \
flac \ flac \
h264 \ h264 \
hevc \
jpegls \ jpegls \
mp3 \ mp3 \
mpeg1video \ mpeg1video \
mpeg2video \ mpeg2video \
mpeg4 \ mpeg4 \
mpegvideo \ mpegvideo \
opus \
png \ png \
vc1 \
vorbis \
wmav1 \ wmav1 \
wmav2 \ wmav2 \
FFMPEG_MINI_DEMUXERS:= \ FFMPEG_MINI_DEMUXERS:= \
aac \
ac3 \
avi \ avi \
flac \ flac \
h264 \
matroska \ matroska \
mov \ mov \
mp3 \ mp3 \
mpegts \ mpegts \
mpegvideo \ mpegvideo \
FFMPEG_MINI_PARSERS:= \
ac3 \
flac \
h264 \
mpeg4video \
mpegaudio \
ogg \
FFMPEG_MINI_PROTOCOLS:= \ FFMPEG_MINI_PROTOCOLS:= \
file \ file \
@ -311,7 +313,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+= +libspeex +libopus
DEPENDS+= +libspeex
VARIANT:=audio-dec VARIANT:=audio-dec
endef endef
@ -526,7 +528,6 @@ ifeq ($(BUILD_VARIANT),mini)
--disable-everything \ --disable-everything \
$(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \
$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \
$(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \
$(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \
endif endif


Write Preview
Loading…
Cancel
Save