[Sumover-dev] [svn commit] r4671 - vic/branches/mpeg4/video

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

Author: douglask
Date: Fri Mar  5 11:48:59 2010
New Revision: 4671

Modified:
   vic/branches/mpeg4/video/grabber-decklink.cpp

Log:
Linux related fixes


Modified: vic/branches/mpeg4/video/grabber-decklink.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-decklink.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-decklink.cpp	Fri Mar  5 11:48:59 2010
@@ -55,13 +55,18 @@
 #include "DeckLinkAPIDispatch.cpp"
 #endif
 
+#include "yuv_convert.h"
+
 #ifdef HAVE_SWSCALE
 extern "C" {
 #include "libswscale/swscale.h"
 #include "libavutil/avutil.h"
+
+#include "config_arch.h"
+#include "cpu/cpudetect.h"
+
+static int available_cpu_flags = cpu_check();
 }
-#else
-#include "yuv_convert.h"
 #endif
 
 #if !defined(_WIN32) && !defined(_WIN64)