From 0b4840af0c42f96e6057ec56919f16f7fbcae3d9 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Fri, 15 Jul 2011 15:40:31 +0200
Subject: [PATCH] vf_libopencv: replace opencv/cxtypes.h #include by
 opencv/cxcore.h

cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980)
---
 Changelog                  | 1 +
 libavfilter/vf_libopencv.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 9f3cb09543..35804f899b 100644
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,7 @@ version 0.7.1:
 - behavioral fix in av_open_input_stream()
 - Licensing clarification for LGPL'ed vf_gradfun
 - bugfixes while seeking in multithreaded decoding
+- support newer versions of OpenCV
 
 
 version 0.7:
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index 5a52f246ba..6e343af7ef 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -26,7 +26,7 @@
 /* #define DEBUG */
 
 #include <opencv/cv.h>
-#include <opencv/cxtypes.h>
+#include <opencv/cxcore.h>
 #include "libavutil/avstring.h"
 #include "libavutil/file.h"
 #include "avfilter.h"