From: Joakim Gissberg <joakim@gissberg.nu>
Date: Tue, 6 Jan 2015 12:26:07 +0000 (+0100)
Subject: Upgrade to FFmpeg 2.5.2
X-Git-Tag: v4.1~514
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba36e4584d2d636ff905fc52270afc508702dc42;p=thirdparty%2Ftvheadend.git

Upgrade to FFmpeg 2.5.2
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 2b8e0e435..b497e1c7c 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -50,10 +50,10 @@ ELIBS           = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
 
 CONFIGURE        = PKG_CONFIG=/tmp/nobin/pkg-config ./configure
 
-FFMPEG          = ffmpeg-2.4.2
+FFMPEG          = ffmpeg-2.5.2
 FFMPEG_TB       = $(FFMPEG).tar.bz2
 FFMPEG_URL      = http://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1     = 8fedc6f235d8510f716bca1784faa8cbe5d9cf78
+FFMPEG_SHA1     = e167475426e8edf55601e79d3367c2210baa5f11
 
 EXTLIBS         = libx264 libvorbis libvpx
 COMPONENTS      = avutil avformat avcodec swresample swscale avresample