Merge pull request #4735 from antonlacon/ffmpeg-next

ffmpeg: fixup mpeg support in libffmpeg-mini
This commit is contained in:
Ted Hess 2017-08-20 07:38:02 -04:00 committed by GitHub
commit 842afdca48
2 changed files with 4 additions and 4 deletions

View File

@ -66,8 +66,8 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_matroska
select FFMPEG_CUSTOM_DEMUXER_mov
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
@ -383,7 +383,7 @@ config FFMPEG_CUSTOM_DEMUXER_mp3
bool "MP3 (MPEG Audio Layer 3)"
config FFMPEG_CUSTOM_DEMUXER_mpegvideo
bool "MPEG Video"
bool "MPEG Video (Raw)"
config FFMPEG_CUSTOM_DEMUXER_mpegps
bool "MPEG-2 (PS)"

View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@ -144,8 +144,8 @@ FFMPEG_MINI_DEMUXERS:= \
matroska \
mov \
mp3 \
mpegps \
mpegts \
mpegvideo \
ogg \
FFMPEG_MINI_PROTOCOLS:= \