[vlc-commits] contrib: ffmpeg: fix minimum required libavcodec after 53d723d5130ab62cba7215cc54fc961bfee51060

[Sean McGovern]

vlc/vlc-3.0 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Tue Dec  5 22:56:20 2017 -0500| [195bdd71509ec9f76d89135c6f2e99fe6fa5dbb4] | committer: Jean-Baptiste Kempf

contrib: ffmpeg: fix minimum required libavcodec after 53d723d5130ab62cba7215cc54fc961bfee51060

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit a010468f69af8962c4f8b7f812e0f9456daac2a3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=195bdd71509ec9f76d89135c6f2e99fe6fa5dbb4
---

 contrib/src/ffmpeg/rules.mak | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b31c1e38ce..f2fa142056 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -8,10 +8,12 @@ ifndef USE_LIBAV
 FFMPEG_HASH=5a93a85fd0ad62c6c9cdf69415959f116c015f0e
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
+FFMPEG_LAVC_MIN := 57.37.100
 else
 FFMPEG_HASH=e171022c24c42b1e88a51bb3b4c27f13c87c85cb
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := git://git.libav.org/libav.git
+FFMPEG_LAVC_MIN := 57.16.0
 endif
 
 FFMPEG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(FFMPEG_HASH))))
@@ -205,7 +207,7 @@ endif
 
 # Build
 PKGS += ffmpeg
-ifeq ($(call need_pkg,"libavcodec >= 55.0.0 libavformat >= 53.21.0 libswscale"),)
+ifeq ($(call need_pkg,"libavcodec >= $(FFMPEG_LAVC_MIN) libavformat >= 53.21.0 libswscale"),)
 PKGS_FOUND += ffmpeg
 endif