Merge pull request openwrt#4785 from thess/ffmpeg-testing

ffmpeg: Add mpeg layer 2 audio support to libffmpeg-mini
ebadi · Aug 30, 2017 · 0f2e10a · 0f2e10a
2 parents e24e7f1 + 808b28d
commit 0f2e10a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
@@ -50,6 +50,7 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
 	select FFMPEG_CUSTOM_DECODER_h264
 	select FFMPEG_CUSTOM_DECODER_hevc
 	select FFMPEG_CUSTOM_DECODER_jpegls
+	select FFMPEG_CUSTOM_DECODER_mp2
 	select FFMPEG_CUSTOM_DECODER_mp3
 	select FFMPEG_CUSTOM_DECODER_mpeg1video
 	select FFMPEG_CUSTOM_DECODER_mpeg2video
@@ -68,6 +69,7 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
 	select FFMPEG_CUSTOM_DEMUXER_mp3
 	select FFMPEG_CUSTOM_DEMUXER_mpegps
 	select FFMPEG_CUSTOM_DEMUXER_mpegts
+	select FFMPEG_CUSTOM_DEMUXER_mpegvideo
 	select FFMPEG_CUSTOM_DEMUXER_ogg
 	select FFMPEG_CUSTOM_PROTOCOL_file
 

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=3.2.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@@ -126,6 +126,7 @@ FFMPEG_MINI_DECODERS:= \
 	h264 \
 	hevc \
 	jpegls \
+	mp2 \
 	mp3 \
 	mpeg1video \
 	mpeg2video \
@@ -146,6 +147,7 @@ FFMPEG_MINI_DEMUXERS:= \
 	mp3 \
 	mpegps \
 	mpegts \
+	mpegvideo \
 	ogg \
 
 FFMPEG_MINI_PROTOCOLS:= \