avoid compile error of opencv_ffmpeg[_64].dll with v2 of FFMPEG wrappers

82db65ae · Vadim Pisarevsky · f551b254 · 82db65ae
Commit 82db65ae authored Apr 09, 2012 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +1 -1

No files found.
--- 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,