From: Rémi Duraffort <ivoire@videolan.org>
Date: Sun, 7 Mar 2010 19:36:06 +0000 (+0100)
Subject: OpenCV: include config.h first
X-Git-Tag: 1.1.0-pre1~456
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bdcee1948728fa600f992c29be0b63dd905c5678;p=vlc

OpenCV: include config.h first
---

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 4f1f087514..159697f4cd 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -25,10 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -42,6 +38,9 @@
 #include <vlc_image.h>
 #include "filter_event_info.h"
 
+#include <cxcore.h>
+#include <cv.h>
+
 /*****************************************************************************
  * filter_sys_t : filter descriptor
  *****************************************************************************/
diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index f0bea126b4..2055dbf9d4 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -24,10 +24,6 @@
  * Preamble
  *****************************************************************************/
 
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -45,6 +41,9 @@
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 
+#include <cxcore.h>
+#include <cv.h>
+
 
 /*****************************************************************************
  * Local prototypes