Makefile.ffmpeg: update ffmpeg to 3.4

diff --git a/Makefile b/Makefile
index a7969c3e2bb57fbeaa569dd453969dd7bb62d951..6c60762f67feaf9d25a115b0c6309450ff4e425e 100644 (file)
--- 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 491b880f4ccc803463b01d3fbf3948b3d49538c8..d2f0130bce27b405f9609c8cb922138d5a1a3ab7 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -94,10 +94,10 @@ LIBOPUS_TB     = $(LIBOPUS).tar.gz
 LIBOPUS_URL    = http://downloads.xiph.org/releases/opus/$(LIBOPUS_TB)
 LIBOPUS_SHA1   = 35d108ca9d6a8d05e52d06c5421a5f95b39fdac9
 
-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
 
 # ##############################################################################
 # Library Config