[vlc-devel] [PATCH] opencv_example: Allow compile with opencv 2.1

[Edward Wang]

---
 modules/video_filter/opencv_example.cpp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index bfa0dc8..69082fe 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -39,9 +39,15 @@
 #include <vlc_image.h>
 #include "filter_event_info.h"
 
+#include <cvver.h>
+#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 2
 #include <opencv2/core/core_c.h>
 #include <opencv2/core/core.hpp>
 #include <opencv2/objdetect/objdetect.hpp>
+#else
+#include <cxcore.h>
+#include <cv.h>
+#endif
 
 /*****************************************************************************
  * filter_sys_t : filter descriptor
-- 
1.7.5.4