[Sumover-dev] [svn commit] r4350 - vic/branches/mpeg4/render

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

Author: piers
Date: Wed Jan 21 14:07:31 2009
New Revision: 4350

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

Log:
Fixes for building with newer ffmpeg

Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Wed Jan 21 14:07:31 2009
@@ -5,11 +5,15 @@
 #include "vw.h"
 #include "renderer.h"
 
-#include "config_arch.h"
+#ifdef WIN32
+#undef ARCH_X86
+#endif
+
 extern "C" {
 #include "libswscale/swscale.h"
 #include "libavutil/avutil.h"
 }
+#include "config_arch.h"
 #include "cpu/cpudetect.h"
 
 int available_cpu_flags = cpu_check();