[vlc-commits] configure: FFmpeg hwaccel requires libavcodec < 57.10.100

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan  7 18:34:34 2016 +0200| [cb24e4f17548c961493a5e1a367ca299624d0cb1] | committer: Rémi Denis-Courmont

configure: FFmpeg hwaccel requires libavcodec < 57.10.100

Since n2.9-dev-1400-g31741ae, the VLC avcodec plug-in will fail to
initialize hwaccel. This is by FFmpeg design.

(cherry picked from commit e57d32f664ff63ead57dca1fed7aedd59edac9fb)

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

 configure.ac |   22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d90097c..6d88db5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2380,11 +2380,18 @@ AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"])
 
 have_avcodec_vaapi="no"
 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.])
+      ])
+      ;;
+  esac
   VLC_SAVE_FLAGS
   CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
   CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
   AC_CHECK_HEADERS([libavcodec/vaapi.h], [
-    AC_MSG_NOTICE([VAAPI acceleration activated])
+    AC_MSG_NOTICE([VA API acceleration activated])
     have_avcodec_vaapi="yes"
   ],[
     AS_IF([test -n "${enable_libva}"], [
@@ -2407,6 +2414,13 @@ have_avcodec_dxva2="no"
 AS_IF([test "${enable_dxva2}" != "no"], [
   if test "${SYS}" = "mingw32"; then
   AS_IF([test "x${have_avcodec}" = "xyes"], [
+    case "${avfork}" in
+      ffmpeg)
+        PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
+        ])
+        ;;
+    esac
     AC_CHECK_HEADERS(dxva2api.h,
       [
         AC_CHECK_HEADERS(libavcodec/dxva2.h, [
@@ -3165,7 +3179,11 @@ have_avcodec_vdpau="no"
 AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
   case "${avfork}" in
     libav) av_vdpau_ver="55.26.0" ;;
-    ffmpeg) av_vdpau_ver="55.42.100" ;;
+    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.])
+      ])
+      ;;
   esac
   PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
     have_avcodec_vdpau="yes"