[vlc-commits] vdpau: work around mismatched FFmpeg version numbers

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar  5 19:45:39 2014 +0200| [06904b8fd409debb76f2c50715a3327f73ad9f9e] | committer: Rémi Denis-Courmont

vdpau: work around mismatched FFmpeg version numbers

FFmpeg doc/APIchanges is not trustworthy.

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

 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 194f9f7..c0d7add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
   ], [