[Gnash-commit] /srv/bzr/gnash/trunk r10632: rearrange headers, and move oputside the name space so swscale functions actually get found at link time.

[rob]

------------------------------------------------------------
revno: 10632
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-02-26 09:50:11 -0700
message:
  rearrange headers, and move oputside the name space so swscale functions 
actually get found at link time.
modified:
  libmedia/ffmpeg/VideoConverterFfmpeg.cpp
  libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
    ------------------------------------------------------------
    revno: 10592.1.32
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Wed 2009-02-25 19:30:27 -0700
    message:
      rearrange header order to fix build on mips.
    modified:
      libmedia/ffmpeg/VideoConverterFfmpeg.cpp
      libmedia/ffmpeg/VideoDecoderFfmpeg.cpp

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2009-02-25 02:00:44 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2009-02-26 16:50:11 +0000
@@ -16,6 +16,24 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA    02110-1301    
USA
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_FFMPEG_SWSCALE_H
+extern "C" {
+#include <ffmpeg/swscale.h>
+}
+#define HAVE_SWSCALE_H 1
+#endif
+
+#ifdef HAVE_LIBSWSCALE_SWSCALE_H
+extern "C" {
+#include <libswscale/swscale.h>
+}
+#define HAVE_SWSCALE_H 1
+#endif
+
 #include "VideoConverterFfmpeg.h"
 #include "GnashException.h"
 

=== modified file 'libmedia/ffmpeg/VideoDecoderFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2009-01-22 20:10:39 +0000
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2009-02-26 02:30:27 +0000
@@ -17,25 +17,28 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA    02110-1301    
USA
 //
 
-
-#include "VideoDecoderFfmpeg.h"
-#include "MediaParserFfmpeg.h" // for ExtraVideoInfoFfmpeg 
-#include "GnashException.h" // for MediaException
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
 
 #ifdef HAVE_FFMPEG_SWSCALE_H
-#define HAVE_SWSCALE_H 1
 extern "C" {
 #include <ffmpeg/swscale.h>
 }
+#define HAVE_SWSCALE_H 1
 #endif
 
 #ifdef HAVE_LIBSWSCALE_SWSCALE_H
-#define HAVE_SWSCALE_H 1
 extern "C" {
 #include <libswscale/swscale.h>
 }
+#define HAVE_SWSCALE_H 1
 #endif
 
+#include "VideoDecoderFfmpeg.h"
+#include "MediaParserFfmpeg.h" // for ExtraVideoInfoFfmpeg 
+#include "GnashException.h" // for MediaException
+
 #include <boost/scoped_array.hpp>
 #include <boost/format.hpp>
 #include <algorithm>