[Gnash-commit] /srv/bzr/gnash/trunk r9569: Newer version of ffmpeg use LIBAVCODEC_VERSION_TRIPLET instead of LIBAVCODEC_VERSION.

[rob]

------------------------------------------------------------
revno: 9569
committer: address@hidden
branch nick: trunk
timestamp: Thu 2008-08-07 16:15:17 -0600
message:
  Newer version of ffmpeg use LIBAVCODEC_VERSION_TRIPLET instead of 
LIBAVCODEC_VERSION.
modified:
  macros/ffmpeg.m4
    ------------------------------------------------------------
    revno: 9568.1.1
    committer: address@hidden
    branch nick: build
    timestamp: Thu 2008-08-07 16:12:55 -0600
    message:
      Newer version of ffmpeg use LIBAVCODEC_VERSION_TRIPLET instead of 
LIBAVCODEC_VERSION.
    modified:
      macros/ffmpeg.m4

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2008-07-09 16:19:11 +0000
+++ b/macros/ffmpeg.m4  2008-08-07 22:12:55 +0000
@@ -212,6 +212,10 @@
         ffmpeg_num_version=$ffmpeg_version
       fi
     fi
+    if test x"${ffmpeg_version}" = x ; then
+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} 
| sed -e "s%[[^0-9]]%%g"`
+      ffmpeg_num_version=$ffmpeg_version
+    fi
 
     AC_MSG_RESULT($ffmpeg_num_version)