]> git.sesse.net Git - vlc/commitdiff
vdpau: work around mismatched FFmpeg version numbers
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 5 Mar 2014 17:45:39 +0000 (19:45 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 5 Mar 2014 17:55:41 +0000 (19:55 +0200)
FFmpeg doc/APIchanges is not trustworthy.

configure.ac

index 194f9f7d32da46fe36463a4623e626d181df403e..c0d7addc77dff02d3a5b37a19d21c2e876422912 100644 (file)
@@ -3052,7 +3052,11 @@ AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"])
 
 have_avcodec_vdpau="no"
 AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
-  PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 55.26.0], [
+  case "${avfork}" in
+    libav) av_vdpau_ver="55.26.0" ;;
+    ffmpeg) av_vdpau_ver="55.42.100" ;;
+  esac
+  PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= ${av_vdpau_ver}], [
     have_avcodec_vdpau="yes"
     AC_MSG_NOTICE([VDPAU decoding acceleration activated])
   ], [