[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/30 16:42:56

Modified files:
        .              : ChangeLog configure.ac 

Log message:
                * configure.ac: if ffmpeg version doesn't match the required one
                  set media handling to none.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3040&r2=1.3041
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.295&r2=1.296

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3040
retrieving revision 1.3041
diff -u -b -r1.3040 -r1.3041
--- ChangeLog   30 Apr 2007 16:07:40 -0000      1.3040
+++ ChangeLog   30 Apr 2007 16:42:56 -0000      1.3041
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <address@hidden>
 
+       * configure.ac: if ffmpeg version doesn't match the required one
+         set media handling to none.
        * testsuite/misc-ming.all/action_execution_order_test8.c: add
          more output trying to understand the problem better.
        * server/parser/shape_character_def.cpp (compute_bounds): harline

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- configure.ac        27 Apr 2007 18:17:16 -0000      1.295
+++ configure.ac        30 Apr 2007 16:42:56 -0000      1.296
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.295 2007/04/27 18:17:16 martinwguy Exp $
+dnl $Id: configure.ac,v 1.296 2007/04/30 16:42:56 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -795,8 +795,8 @@
 
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
-  if test x"${ac_cv_path_ffmpeg_lib}" = x ; then
-    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling 
media handling])
+  if test x"${ac_cv_path_ffmpeg_lib}" = x -o x${ffmpeg_version} != xok; then
+    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present or it's 
version is too old, disabling media handling])
     media_handler=none
   fi
 fi