[vlc-commits] Relax requirements for FFmpeg hwaccel

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Feb 26 00:36:26 2016 +0000| [b8869f97ea66ac7ec9912a74c2e8b5e15daf7752] | committer: Rafaël Carré

Relax requirements for FFmpeg hwaccel

It doesn't error out anymore since 5edd1f62ca1

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

 configure.ac |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index aae658e..be65881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2371,7 +2371,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
   case "${avfork}" in
     ffmpeg)
       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
+          AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
+        ])
       ])
       ;;
   esac
@@ -2405,7 +2407,9 @@ AS_IF([test "${enable_dxva2}" != "no"], [
     case "${avfork}" in
       ffmpeg)
         PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
+          PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
+            AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
+          ])
         ])
         ;;
     esac
@@ -3113,7 +3117,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
     libav) av_vdpau_ver="55.26.0" ;;
     ffmpeg) av_vdpau_ver="55.42.100"
       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
+          AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
+        ])
       ])
       ;;
   esac