From 82db65ae8f8a29416c75a4436fb97f7595d32f3e Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 9 Apr 2012 17:18:00 +0000 Subject: [PATCH] avoid compile error of opencv_ffmpeg[_64].dll with v2 of FFMPEG wrappers --- modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index dc2dcea496..1d1a6a4d11 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -573,7 +573,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int, unsigned char** data, int* step, int* ); if (img_convert_ctx == NULL) - CV_Error(0, "Cannot initialize the conversion context!"); + return false;//CV_Error(0, "Cannot initialize the conversion context!"); sws_scale( img_convert_ctx,