[Gnash-commit] /srv/bzr/gnash/trunk r9807: Fail ffmpeg version check if version > 52.0.0 and swscale isn't found

[Sandro Santilli]

------------------------------------------------------------
revno: 9807
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-22 13:29:59 +0200
message:
  Fail ffmpeg version check if version > 52.0.0 and swscale isn't found
modified:
  configure.ac
  macros/ffmpeg.m4

=== modified file 'configure.ac'
--- a/configure.ac      2008-09-22 10:22:09 +0000
+++ b/configure.ac      2008-09-22 11:29:59 +0000
@@ -2613,9 +2613,14 @@
     if test x"$FFMPEG_LIBS" != x; then
       echo "        MP3 and video support enabled through ffmpeg"
       if test x"${ffmpeg_version_check}" != xok; then
-        echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg 
installed." >&3
-        echo "               This version of ffmpeg may not work!" >&3
-        echo "               Version 51.27.0 or newer is highly recommended." 
>&3
+        echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg 
installed," >&3
+        if test x"${have_ffmpeg_swscale}" = "xno"; then
+          echo "               with no swscale enabled." >&3
+        else
+          echo "               with swscale enabled." >&3
+        fi
+        echo "               This setup isn't supported!" >&3
+        echo "               Version 51.27.0 or newer is required, enabling 
swscale if >= 52.0.0." >&3
       else
        if test x"${avformat_h}" = x; then
           echo "        ERROR: FFMPEG's libavcodec header is installed but not 
libavformat." >&3

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2008-09-22 10:38:10 +0000
+++ b/macros/ffmpeg.m4  2008-09-22 11:29:59 +0000
@@ -289,16 +289,25 @@
   fi
   AC_MSG_RESULT($avformat_h)
 
+  have_ffmpeg_swscale=no
+
   dnl look for swscale.h, but ignore versions older than 51.40.3
   if test $ffmpeg_num_version -gt 514003; then
     if test -f "${topdir}/ffmpeg/swscale.h"; then
+      have_ffmpeg_swscale=yes
       AC_DEFINE(HAVE_FFMPEG_SWSCALE_H, 1, [Define if swscale.h is found])
     fi
     if test -f "${topdir}/libswscale/swscale.h"; then
+      have_ffmpeg_swscale=yes
       AC_DEFINE(HAVE_LIBSWSCALE_SWSCALE_H, 1, [Define if swscale.h is found])
     fi
   fi
 
+  if test x"$have_ffmpeg_swscale" = "xno" -a $ffmpeg_num_version -ge 520000; 
then
+     AC_MSG_WARN([Cannot find swscale.h, required for ffmpeg versions >= 
52.0.0 (detected version: $ffmpeg_version)])
+     ffmpeg_version_check=
+  fi
+
   dnl Look for the library
   AC_ARG_WITH(ffmpeg_lib, AC_HELP_STRING([--with-ffmpeg-lib], [directory where 
ffmpeg libraries are]), with_ffmpeg_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_ffmpeg_lib, [