From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 23 Aug 2017 10:27:56 +0000 (+0200)
Subject: Makefile.ffmpeg: add some demuxers for latest IPTV libav input
X-Git-Tag: v4.2.4~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83625136c693d63e62b28261b3dd01c0dbba98a0;p=thirdparty%2Ftvheadend.git

Makefile.ffmpeg: add some demuxers for latest IPTV libav input
---

diff --git a/Makefile b/Makefile
index 14052f147..d1128b521 100644
--- a/Makefile
+++ b/Makefile
@@ -784,6 +784,13 @@ ifeq ($(CONFIG_BINTRAY_CACHE),yes)
 endif
 	$(MAKE) -f Makefile.hdhomerun
 
+.PHONY: ffmpeg_rebuild
+ffmpeg_rebuild:
+	-rm ${BUILDDIR}/ffmpeg/build/ffmpeg/lib/libavcodec.a
+	-rm ${BUILDDIR}/libffmpeg_stamp
+	-rm ${BUILDDIR}/ffmpeg/ffmpeg-*/.tvh_build
+	$(MAKE) all
+
 # linuxdvb git tree
 $(ROOTDIR)/data/dvb-scan/.stamp:
 	@echo "Receiving data/dvb-scan from https://github.com/tvheadend/dtv-scan-tables.git#tvheadend"
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 149650ab5..3b31f0003 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -37,7 +37,7 @@ COMPONENTS     = avutil avcodec avformat swscale avresample swresample avfilter
 PROTOCOLS      = file
 DECODERS       = mpeg2video mp2 aac vorbis ac3 eac3 aac_latm h264 hevc
 ENCODERS       = mpeg2video mp2 aac vorbis
-MUXERS         = mpegts mpeg2dvd matroska webm mp4
+MUXERS         = mpegts dvd matroska mp4
 BSFS           = h264_mp4toannexb hevc_mp4toannexb
 FILTERS        = yadif scale null aresample anull
 
@@ -93,10 +93,10 @@ LIBMFX_URL     = https://github.com/lu-zero/mfx_dispatch/archive/$(LIBMFX_TB)
 LIBMFX_SHA1    = 33dec0b054d842e8380eb31b97afe02d07d5c6fc
 LIBMFX_DIFFS   =
 
-FFMPEG         = ffmpeg-3.3.2
+FFMPEG         = ffmpeg-3.3.3
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = http://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = 584544ced449e4a05f17711da33d7c46fd72f2e4
+FFMPEG_SHA1    = 23bce5ccc4aeae23e1893d6cea7b1bd57b2591cb
 
 
 # ##############################################################################