From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 16 Oct 2017 15:39:16 +0000 (+0200)
Subject: Makefile.ffmpeg: update ffmpeg to 3.4
X-Git-Tag: v4.2.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6d9860ea27e89a55cfe8466bdb12a61de8add73;p=thirdparty%2Ftvheadend.git

Makefile.ffmpeg: update ffmpeg to 3.4
---

diff --git a/Makefile b/Makefile
index d1128b521..ef760f454 100644
--- a/Makefile
+++ b/Makefile
@@ -101,9 +101,12 @@ endif
 
 FFMPEG_PREFIX := $(BUILDDIR)/ffmpeg/build/ffmpeg
 FFMPEG_LIBDIR := $(FFMPEG_PREFIX)/lib
+FFMPEG_INCDIR := $(FFMPEG_PREFIX)/include
 FFMPEG_CONFIG := \
     PKG_CONFIG_LIBDIR=$(FFMPEG_LIBDIR)/pkgconfig $(PKG_CONFIG) \
-    --define-variable=prefix=$(FFMPEG_PREFIX) --static
+    --define-variable=prefix=$(FMPEG_PREFIX) \
+    --define-variable=includedir=$(FFMPEG_INCDIR) \
+    --define-variable=libdir=$(FFMPEG_LIBDIR) --static
 
 ifeq ($(CONFIG_LIBX264_STATIC),yes)
 FFMPEG_DEPS += libx264
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 4cb2f2e75..5309e6dec 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -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.4
+FFMPEG         = ffmpeg-3.4
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = http://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = 6cf8f6d927d705b1844f601d93dd4036bd8d5b5d
+FFMPEG_SHA1    = 6cfb7f4549a5b2dce6a8442ce16c76739c09dd6d
 
 
 # ##############################################################################