ffmpeg: update to 4.2.2

Drop upstreamed libfdk-aac patches.

ffserver was removed in 4.0. ffmpeg does not have a replacement.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard
2019-12-14 21:27:35 -08:00
parent 43d903c6d2
commit 5328a2f393
6 changed files with 5 additions and 366 deletions

View File

@@ -42,13 +42,6 @@ config FFMPEG_CUSTOM_LARGE
comment "Profiles"
config FFMPEG_CUSTOM_FFSERVER_SUPPORT
bool "Include support for ffserver (FFmpeg streaming server)"
select FFMPEG_CUSTOM_MUXER_ffm
select FFMPEG_CUSTOM_DEMUXER_ffm
select FFMPEG_CUSTOM_DEMUXER_rtsp
select FFMPEG_CUSTOM_PROTOCOL_rtp
config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
bool "Include support for minidlna"
select FFMPEG_CUSTOM_DECODER_aac
@@ -136,7 +129,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
config FFMPEG_CUSTOM_PROGRAMS
bool "Include ffmpeg command-line utilities"
select PACKAGE_ffmpeg-custom
select PACKAGE_ffserver-custom
select PACKAGE_ffprobe-custom
comment "External Libraries"
@@ -311,9 +303,6 @@ comment "Muxers"
config FFMPEG_CUSTOM_MUXER_ac3
bool "AC3"
config FFMPEG_CUSTOM_MUXER_ffm
bool "FFM (ffserver live feed)"
config FFMPEG_CUSTOM_MUXER_h264
bool "H.264 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED
@@ -363,9 +352,6 @@ config FFMPEG_CUSTOM_DEMUXER_ape
config FFMPEG_CUSTOM_DEMUXER_flac
bool "FLAC"
config FFMPEG_CUSTOM_DEMUXER_ffm
bool "FFM (ffserver live feed)"
config FFMPEG_CUSTOM_DEMUXER_h264
bool "H.264 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED