vlc/vlc-2.2 | branch: master | Samuel Martin <[email protected]> | Sun May 24 14:30:09 2015 +0200| [0f454d4c2da6b4ba67475c6a1bed732634e2d9cf] | committer: Jean-Baptiste Kempf
opencv_wrapper: use opencv2-style includes If old opencv1-style legacy include directory is available, this change becomes purely cosmetic (maybe will compile a bit faster). It becomes an FTBFS fix when opencv1-style include directory is missing (i.e. from opencv-3.0). Signed-off-by: Samuel Martin <[email protected]> Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit cc236e4652255902f2c2cee3b18f83367f35a8c7) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0f454d4c2da6b4ba67475c6a1bed732634e2d9cf --- modules/video_filter/opencv_wrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index 0ca54a3..7ab9621 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -39,8 +39,8 @@ #include <vlc_image.h> #include "filter_picture.h" -#include <cxcore.h> -#include <cv.h> +#include <opencv2/core/core_c.h> +#include <opencv2/core/types_c.h> /***************************************************************************** * Local prototypes _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
