[Gnash-commit] /srv/bzr/gnash/trunk r10608: class refactoring and extern C for the include for libswscale

[Markus Gothe]

------------------------------------------------------------
revno: 10608
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Mon 2009-02-23 02:07:03 +0100
message:
  class refactoring and extern C for the include for libswscale
modified:
  libmedia/ffmpeg/VideoConverterFfmpeg.cpp
  libmedia/ffmpeg/VideoConverterFfmpeg.h

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2009-02-21 14:19:48 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp  2009-02-23 01:07:03 +0000
@@ -23,31 +23,6 @@
 namespace media {
 namespace ffmpeg {
 
-#ifdef HAVE_SWSCALE_H
-/// A wrapper round an SwsContext that ensures it's
-/// freed on destruction.
-class SwsContextWrapper
-{
-public:
-
-    SwsContextWrapper(SwsContext* context)
-        :
-        _context(context)
-    {}
-
-    ~SwsContextWrapper()
-    {
-         sws_freeContext(_context);
-    }
-    
-    SwsContext* getContext() const { return _context; }
-
-private:
-    SwsContext* _context;
-
-};
-#endif
-
 // The lookup table in this function is adapted from chroma.c from the VLC
 // codebase; its license permits distribution under GPLv3 and later.
 PixelFormat

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.h'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.h    2009-02-21 14:19:48 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.h    2009-02-23 01:07:03 +0000
@@ -29,7 +29,9 @@
 #include "log.h"
 
 #if HAVE_SWSCALE_H
+extern "C" {
 #include <libswscale/swscale.h>
+}
 #endif
 
 
@@ -39,6 +41,31 @@
 
 class SwsContextWrapper;
 
+#ifdef HAVE_SWSCALE_H
+/// A wrapper round an SwsContext that ensures it's
+/// freed on destruction.
+class SwsContextWrapper
+{
+public:
+
+    SwsContextWrapper(SwsContext* context)
+        :
+        _context(context)
+    {}
+
+    ~SwsContextWrapper()
+    {
+         sws_freeContext(_context);
+    }
+    
+    SwsContext* getContext() const { return _context; }
+
+private:
+    SwsContext* _context;
+
+};
+#endif
+
 class VideoConverterFfmpeg : public VideoConverter {
 
 public: