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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/05/31 21:48:33

Modified files:
        libbase        : embedVideoDecoderFfmpeg.cpp 
        server/asobj   : NetStreamFfmpeg.cpp 

Log message:
        * libbase/embedVideoDecoderFfmpeg.cpp: conditionally include swscale.h 
itself.        
        * server/asobj/NetStreamFfmpeg.cpp: Remove unused include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.80&r2=1.81

Patches:
Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/embedVideoDecoderFfmpeg.cpp 31 May 2007 21:18:20 -0000      1.12
+++ libbase/embedVideoDecoderFfmpeg.cpp 31 May 2007 21:48:33 -0000      1.13
@@ -24,7 +24,11 @@
 #include <cstring>
 
 #include "embedVideoDecoderFfmpeg.h"
+
+#ifdef HAVE_SWSCALE_H
 #include <ffmpeg/swscale.h>
+#endif
+
 #include <boost/scoped_array.hpp>
 
 embedVideoDecoderFfmpeg::embedVideoDecoderFfmpeg() :

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/asobj/NetStreamFfmpeg.cpp    31 May 2007 15:52:28 -0000      1.80
+++ server/asobj/NetStreamFfmpeg.cpp    31 May 2007 21:48:33 -0000      1.81
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.80 2007/05/31 15:52:28 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.81 2007/05/31 21:48:33 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,7 +36,6 @@
 #include "embedVideoDecoderFfmpeg.h"
 
 #include <boost/scoped_array.hpp>
-#include <ffmpeg/swscale.h>
 
 
 #if defined(_WIN32) || defined(WIN32)