[Gnash-commit] /srv/bzr/gnash/trunk r12326: Look for swscale.h in top-level ffmpeg include dir too. Put all swscale.h header inclusion in the ad-hoc ffmpegHeaders.h file. Tested with official ubuntu-8.10 ffmpeg packages and ffmpeg svn

[Sandro Santilli]

------------------------------------------------------------
revno: 12326
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-22 22:21:00 +0200
message:
  Look for swscale.h in top-level ffmpeg include dir too. Put all swscale.h 
header inclusion in the ad-hoc ffmpegHeaders.h file. Tested with official 
ubuntu-8.10 ffmpeg packages and ffmpeg svn 
modified:
  libmedia/ffmpeg/VideoConverterFfmpeg.cpp
  libmedia/ffmpeg/VideoConverterFfmpeg.h
  libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
  libmedia/ffmpeg/ffmpegHeaders.h
  macros/ffmpeg.m4

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2010-03-11 20:45:42 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2010-07-22 20:21:00 +0000
@@ -20,22 +20,9 @@
 #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"
+#include "ffmpegHeaders.h"
 #include "log.h"
 
 namespace gnash {

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.h'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.h    2010-03-11 17:03:04 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.h    2010-07-22 20:21:00 +0000
@@ -21,13 +21,6 @@
 #include "ffmpegHeaders.h"
 #include "VideoConverter.h"
 
-#if HAVE_SWSCALE_H
-extern "C" {
-#include <libswscale/swscale.h>
-}
-#endif
-
-
 namespace gnash {
 namespace media {
 namespace ffmpeg {

=== modified file 'libmedia/ffmpeg/VideoDecoderFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2010-04-04 22:55:35 +0000
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp    2010-07-22 20:21:00 +0000
@@ -21,20 +21,7 @@
 #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 "ffmpegHeaders.h"
 #include "VideoDecoderFfmpeg.h"
 #include "MediaParserFfmpeg.h" // for ExtraVideoInfoFfmpeg 
 #include "GnashException.h" // for MediaException

=== modified file 'libmedia/ffmpeg/ffmpegHeaders.h'
--- a/libmedia/ffmpeg/ffmpegHeaders.h   2010-01-01 17:48:26 +0000
+++ b/libmedia/ffmpeg/ffmpegHeaders.h   2010-07-22 20:21:00 +0000
@@ -62,8 +62,25 @@
 #endif
 
 
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H)
-# define HAVE_SWSCALE_H 1
-#endif
+#ifdef HAVE_SWSCALE_H
+extern "C" {
+#include <swscale.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
+
 
 #endif // GNASH_MEDIA_FFMPEG_HEADERS_H

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2010-07-22 19:57:48 +0000
+++ b/macros/ffmpeg.m4  2010-07-22 20:21:00 +0000
@@ -284,6 +284,10 @@
     have_ffmpeg_swscale=yes
     AC_DEFINE(HAVE_LIBSWSCALE_SWSCALE_H, 1, [Define if swscale.h is found])
   fi
+  if test -f "${ffmpeg_top_incl}/swscale.h"; then
+    have_ffmpeg_swscale=yes
+    AC_DEFINE(HAVE_SWSCALE_H, 1, [Define if swscale.h is found])
+  fi
   AC_MSG_RESULT($have_ffmpeg_swscale)
 
   if test x"$have_ffmpeg_swscale" = "xno" -a 1$ffmpeg_num_version -ge 
1"520000"; then