[Sumover-dev] [svn commit] r4125 - in vic/branches/mpeg4: render

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Sun Mar  2 04:00:37 2008
New Revision: 4125

Modified:
   vic/branches/mpeg4/render/color-swscale.cpp
   vic/branches/mpeg4/video/deinterlace.h

Log:
explicit extern "C" for several ffmpeg header file includes


Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Sun Mar  2 04:00:37 2008
@@ -6,8 +6,10 @@
 #include "renderer.h"
 
 #include "config_arch.h"
+extern "C" {
 #include "ffmpeg/swscale.h"
 #include "ffmpeg/avutil.h"
+}
 #include "cpu/cpudetect.h"
 
 int available_cpu_flags = cpu_check();

Modified: vic/branches/mpeg4/video/deinterlace.h
==============================================================================
--- vic/branches/mpeg4/video/deinterlace.h	(original)
+++ vic/branches/mpeg4/video/deinterlace.h	Sun Mar  2 04:00:37 2008
@@ -6,7 +6,9 @@
 typedef unsigned char uint8_t;
 
 #include "cpu/cpudetect.h"
+extern "C" {
 #include <postproc/postprocess.h>
+}
 
 // only used for YUV420
 class Deinterlace