[Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/07/08 20:47:14

Modified files:
        macros         : ffmpeg.m4 
        .              : ChangeLog 

Log message:
                * macros/ffmpeg.m4: Don't zero ffmpeg_version if too early; it 
is used
                  in the final error report and is always checked against "ok" 
to see
                  if there is an acceptable version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3678&r2=1.3679

Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- macros/ffmpeg.m4    1 Jul 2007 10:54:11 -0000       1.46
+++ macros/ffmpeg.m4    8 Jul 2007 20:47:13 -0000       1.47
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.46 2007/07/01 10:54:11 bjacques Exp $
+dnl $Id: ffmpeg.m4,v 1.47 2007/07/08 20:47:13 martinwguy Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -107,7 +107,6 @@
   
     if test "$ffmpeg_num_version" -lt 51110; then
       AC_MSG_WARN([Wrong ffmpeg/libavcodec version! 51.11.0 or greater 
required])
-      ffmpeg_version=
     else
       ffmpeg_version=ok
     fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3678
retrieving revision 1.3679
diff -u -b -r1.3678 -r1.3679
--- ChangeLog   8 Jul 2007 20:26:48 -0000       1.3678
+++ ChangeLog   8 Jul 2007 20:47:13 -0000       1.3679
@@ -11,6 +11,9 @@
        * gui/gtk_glue_cairo.h: Drop unused variable compiler warnings
        * backend/sound_handler.h libbase/FLVParser.h:
          Document extra NELLYMOSER format code (mentioned in libavcodec/flv.h)
+       * macros/ffmpeg.m4: Don't zero ffmpeg_version if too early; it is used
+         in the final error report and is always checked against "ok" to see
+         if there is an acceptable version.
 
 2007-07-07 Markus Gothe <address@hidden>