Browse Source

ffmpeg: fixup mpeg support in libffmpeg-mini

The demuxers mpegps is for VOB support and mpegvideo is for raw mpeg video.
mpegps was intended to be included with libffmpeg-mini; mpegvideo was not.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
lilik-openwrt-22.03
Ian Leonard 7 years ago
parent
commit
08554be366
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      multimedia/ffmpeg/Config.in
  2. +2
    -2
      multimedia/ffmpeg/Makefile

+ 2
- 2
multimedia/ffmpeg/Config.in View File

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


+ 2
- 2
multimedia/ffmpeg/Makefile View File

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


Loading…
Cancel
Save