[Gnash-commit] gnash libbase/embedVideoDecoderFfmpeg.cpp libba...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/14 14:18:27

Modified files:
        libbase        : embedVideoDecoderFfmpeg.cpp curl_adapter.cpp 
                         noseek_fd_adapter.cpp URL.cpp 
        macros         : mtasc.m4 
        .              : ChangeLog 

Log message:
                * macros/mtasc.m4: Patch #9531, fix variable name for MTASC.
                * libbase/noseek_fd_adapter.cpp: Include cstring to get C string
                functions used for char * manipulation.
                * libbase/URL.cpp: Include cstring to get C string functions 
used
                for char * manipulation. 
                * libbase/embedVideoDecoderFfmpeg.cpp: Include cstring to get C
                string functions used for char * manipulation.
                * libbase/curl_adapter.cpp: Include cstring to get C string
                functions used for char * manipulation. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mtasc.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3197&r2=1.3198

Patches:
Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/embedVideoDecoderFfmpeg.cpp 9 Apr 2007 10:11:51 -0000       1.6
+++ libbase/embedVideoDecoderFfmpeg.cpp 14 May 2007 14:18:26 -0000      1.7
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,14 +14,14 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: embedVideoDecoderFfmpeg.cpp,v 1.6 2007/04/09 10:11:51 strk Exp $
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef USE_FFMPEG
 
+#include <cstring>
+
 #include "embedVideoDecoderFfmpeg.h"
 
 embedVideoDecoderFfmpeg::embedVideoDecoderFfmpeg() :

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/curl_adapter.cpp    12 May 2007 09:59:44 -0000      1.32
+++ libbase/curl_adapter.cpp    14 May 2007 14:18:26 -0000      1.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: curl_adapter.cpp,v 1.32 2007/05/12 09:59:44 tgc Exp $ */
+/* $Id: curl_adapter.cpp,v 1.33 2007/05/14 14:18:26 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,11 +32,12 @@
 #include <map>
 #include <iostream>
 #include <string>
+#include <cstring>
 #if defined(_WIN32) || defined(WIN32)
-       #include <Windows.h>    // for sleep()
-       #define usleep(x) Sleep(x/1000)
+# include <windows.h>  // for sleep()
+# define usleep(x) Sleep(x/1000)
 #else
-       #include "unistd.h" // for usleep()
+# include "unistd.h" // for usleep()
 #endif
 
 using namespace std;

Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/noseek_fd_adapter.cpp       2 May 2007 16:24:12 -0000       1.17
+++ libbase/noseek_fd_adapter.cpp       14 May 2007 14:18:26 -0000      1.18
@@ -14,8 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: noseek_fd_adapter.cpp,v 1.17 2007/05/02 16:24:12 rsavoye Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -26,6 +24,7 @@
 #include "GnashException.h"
 #include "log.h"
 #include <unistd.h>
+#include <cstring>
 
 //#define GNASH_NOSEEK_FD_VERBOSE 1
 

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libbase/URL.cpp     17 Apr 2007 17:46:20 -0000      1.35
+++ libbase/URL.cpp     14 May 2007 14:18:27 -0000      1.36
@@ -24,7 +24,7 @@
 //#include "rc.h"
 
 #include <string>
-//#include <cstring>
+#include <cstring>
 #include <vector>
 #include <cassert>
 #include <sstream>

Index: macros/mtasc.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mtasc.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/mtasc.m4     12 Feb 2007 23:49:10 -0000      1.1
+++ macros/mtasc.m4     14 May 2007 14:18:27 -0000      1.2
@@ -46,7 +46,7 @@
       yes|no) ;;
       *) MTASC_CLASSPATH=${withval} ;;
     esac
-  ], MTASC="")
+  ], MTASC_CLASSPATH="")
 
   if test x"$MTASC" = "x"; then
     AC_PATH_PROG(MTASC, mtasc, ,[${pathlist}])

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3197
retrieving revision 1.3198
diff -u -b -r1.3197 -r1.3198
--- ChangeLog   14 May 2007 14:02:27 -0000      1.3197
+++ ChangeLog   14 May 2007 14:18:27 -0000      1.3198
@@ -5,6 +5,16 @@
 
 2007-05-14  Rob Savoye  <address@hidden>
 
+       * macros/mtasc.m4: Patch #9531, fix variable name for MTASC.
+       * libbase/noseek_fd_adapter.cpp: Include cstring to get C string
+       functions used for char * manipulation.
+       * libbase/URL.cpp: Include cstring to get C string functions used
+       for char * manipulation. 
+       * libbase/embedVideoDecoderFfmpeg.cpp: Include cstring to get C
+       string functions used for char * manipulation.
+       * libbase/curl_adapter.cpp: Include cstring to get C string
+       functions used for char * manipulation. 
+
        * server/gnash.h: Include memory for auto_ptr.
        * libamf/amf.h: Include cstring for C string functions.
        * libamf/amf.cpp: Use lower case for win32 headers, as that's what