[vlc-commits] commit: OpenCV: include config.h first ( Rémi Duraffort )
git at videolan.org
git at videolan.org
Sun Mar 7 20:40:45 CET 2010
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sun Mar 7 20:36:06 2010 +0100| [bdcee1948728fa600f992c29be0b63dd905c5678] | committer: Rémi Duraffort
OpenCV: include config.h first
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bdcee1948728fa600f992c29be0b63dd905c5678
---
modules/video_filter/opencv_example.cpp | 7 +++----
modules/video_filter/opencv_wrapper.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 4f1f087..159697f 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 f0bea12..2055dbf 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
More information about the vlc-commits
mailing list