[Gnash-commit] /srv/bzr/gnash/trunk r9814: Hide ffmpeg include dust in a custom header, included by all users.

[Sandro Santilli]

------------------------------------------------------------
revno: 9814
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-22 18:56:45 +0200
message:
  Hide ffmpeg include dust in a custom header, included by all users.
  Provide the damn INT64_C macro if not defined. Fixes support for 51.40.2
  and 51.40.4 and 51.12.1  and who knows what else
modified:
  libmedia/Makefile.am
  libmedia/ffmpeg/AudioDecoderFfmpeg.h
  libmedia/ffmpeg/MediaParserFfmpeg.h
  libmedia/ffmpeg/VideoDecoderFfmpeg.h
  libmedia/ffmpeg/ffmpegNetStreamUtil.h
  libmedia/ffmpeg/sound_handler_sdl.h

=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am      2008-08-18 23:53:04 +0000
+++ b/libmedia/Makefile.am      2008-09-22 16:56:45 +0000
@@ -145,7 +145,8 @@
                ffmpeg/AudioDecoderFfmpeg.h \
                ffmpeg/VideoDecoderFfmpeg.h \
                ffmpeg/sound_handler_sdl.h \
-               ffmpeg/ffmpegNetStreamUtil.h 
+               ffmpeg/ffmpegNetStreamUtil.h \
+               ffmpeg/ffmpegHeaders.h
 
    libgnashmedia_la_LIBADD += \
                $(FFMPEG_LIBS) \

=== modified file 'libmedia/ffmpeg/AudioDecoderFfmpeg.h'
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.h      2008-06-06 09:19:57 +0000
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.h      2008-09-22 16:56:45 +0000
@@ -20,25 +20,15 @@
 #ifndef __AUDIODECODERFFMPEG_H__
 #define __AUDIODECODERFFMPEG_H__
 
+// TODO: What's this for ?
 #ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_FFMPEG_AVCODEC_H
-extern "C" {
-# include "ffmpeg/avcodec.h"
-}
-#endif
-
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-extern "C" {
-# include "libavcodec/avcodec.h"
-}
-#endif
-
 #include "log.h"
 #include "AudioDecoder.h"
 #include "ffmpegNetStreamUtil.h"
+#include "ffmpegHeaders.h"
 
 namespace gnash {
 namespace media {

=== modified file 'libmedia/ffmpeg/MediaParserFfmpeg.h'
--- a/libmedia/ffmpeg/MediaParserFfmpeg.h       2008-06-16 13:41:51 +0000
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.h       2008-09-22 16:56:45 +0000
@@ -25,23 +25,12 @@
 #endif
 
 #include "MediaParser.h" // for inheritance
+#include "ffmpegHeaders.h"
 
 #include <vector>
 #include <boost/scoped_array.hpp>
 #include <memory>
 
-#ifdef HAVE_FFMPEG_AVFORMAT_H
-extern "C" {
-#include <ffmpeg/avformat.h>
-}
-#endif
-
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-extern "C" {
-#include <libavformat/avformat.h>
-}
-#endif
-
 // Forward declaration
 namespace gnash {
        class IOChannel;

=== modified file 'libmedia/ffmpeg/VideoDecoderFfmpeg.h'
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.h      2008-09-22 12:43:25 +0000
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.h      2008-09-22 16:56:45 +0000
@@ -29,23 +29,7 @@
 #include "log.h"
 #include "VideoDecoder.h"
 #include "MediaParser.h" // for videoCodecType enum
-
-#ifdef HAVE_FFMPEG_AVCODEC_H
-extern "C" {
-# include <ffmpeg/avcodec.h>
-}
-#endif
-
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-extern "C" {
-# include <libavcodec/avcodec.h>
-}
-#endif
-
-
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H)
-# define HAVE_SWSCALE_H 1
-#endif
+#include "ffmpegHeaders.h"
 
 
 namespace gnash {

=== modified file 'libmedia/ffmpeg/ffmpegNetStreamUtil.h'
--- a/libmedia/ffmpeg/ffmpegNetStreamUtil.h     2008-05-23 04:58:07 +0000
+++ b/libmedia/ffmpeg/ffmpegNetStreamUtil.h     2008-09-22 16:56:45 +0000
@@ -28,18 +28,8 @@
 #include "log.h"
 #include "dsodefs.h" //For DSOEXPORT
 
-#ifdef USE_FFMPEG
-#ifdef HAVE_FFMPEG_AVCODEC_H
-extern "C" {
-#include <ffmpeg/avcodec.h>
-}
-#endif
-  
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
-#endif
+#ifdef USE_FFMPEG // does this make any sense ?
+# include "ffmpegHeaders.h"
 #endif
 
 #include <queue>

=== modified file 'libmedia/ffmpeg/sound_handler_sdl.h'
--- a/libmedia/ffmpeg/sound_handler_sdl.h       2008-09-15 14:17:20 +0000
+++ b/libmedia/ffmpeg/sound_handler_sdl.h       2008-09-22 16:56:45 +0000
@@ -28,19 +28,9 @@
 #include "log.h"
 
 #ifdef USE_FFMPEG
-#ifdef HAVE_FFMPEG_AVCODEC_H
-extern "C" {
-# include "ffmpeg/avcodec.h"
-}
-#endif
-
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-extern "C" {
-# include "libavcodec/avcodec.h"
-}
-#endif
+# include "ffmpegHeaders.h"
 #elif defined(USE_MAD)
-#include <mad.h>
+# include <mad.h>
 #endif
 
 #include <vector>