[Gnash-commit] /srv/bzr/gnash/trunk r9624: Fix build with older versions of ffmpeg (which will abort if they encounter

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9624
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2008-08-19 09:37:42 +0200
message:
  Fix build with older versions of ffmpeg (which will abort if they encounter
  a VP6A video).
modified:
  libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
  macros/ffmpeg.m4
    ------------------------------------------------------------
    revno: 9609.1.15
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-19 08:56:50 +0200
    message:
      Add a test for VP6A capabilities, use in VideoDecoderFfmpeg.
    modified:
      libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
      macros/ffmpeg.m4
    ------------------------------------------------------------
    revno: 9609.1.16
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-19 08:57:35 +0200
    message:
      Merge in from trunk (FLV fixes are relevant to VideoDecoder).
    added:
      utilities/rtmpget.cpp
    modified:
      cygnal/Makefile.am
      libamf/flv.cpp
      libcore/asobj/Global.cpp
      libcore/asobj/Math_as.cpp
      libcore/asobj/Number.cpp
      libcore/asobj/flash/geom/Matrix_as.cpp
      packaging/deb.am
      packaging/install-gnash.sh
      packaging/snapshot.am
      testsuite/libamf.all/test_flv.cpp
      testsuite/libcore.all/AsValueTest.cpp
      utilities/Makefile.am

=== modified file 'libmedia/ffmpeg/VideoDecoderFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2008-08-18 23:53:04 +0000
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2008-08-19 06:57:35 +0000
@@ -36,8 +36,6 @@
 #endif
 
 #include <boost/scoped_array.hpp>
-//#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 
 namespace gnash {
@@ -253,15 +251,17 @@
 #ifdef FFMPEG_VP6
         case VIDEO_CODEC_VP6:
             return CODEC_ID_VP6F;
+#endif
+#ifdef FFMPEG_VP6A
         case VIDEO_CODEC_VP6A:
-            return CODEC_ID_VP6A;
+               return CODEC_ID_VP6A;
 #endif
         case VIDEO_CODEC_SCREENVIDEO:
             return CODEC_ID_FLASHSV;
         default:
-        log_error(_("Unsupported video codec %d"),
-            static_cast<int>(format));
-        return CODEC_ID_NONE;
+            log_error(_("Unsupported video codec %d"),
+                static_cast<int>(format));
+            return CODEC_ID_NONE;
     }
 }
 

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2008-08-07 22:12:55 +0000
+++ b/macros/ffmpeg.m4  2008-08-19 06:56:50 +0000
@@ -236,6 +236,13 @@
     else
       AC_DEFINE(FFMPEG_VP6, 1, [Define if ffmpeg can play VP6.])
     fi
+
+    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51490; then
+      AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6A 
encoded video!])
+    else
+      AC_DEFINE(FFMPEG_VP6A, 1, [Define if ffmpeg can play VP6A.])
+    fi
+
   else
     AC_MSG_WARN([Could not check ffmpeg version (dunno where avcodec.h is)])
     ffmpeg_version=ok # trust the user-specified dir