projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f551b25
)
avoid compile error of opencv_ffmpeg[_64].dll with v2 of FFMPEG wrappers
author
Vadim Pisarevsky
<no@email>
Mon, 9 Apr 2012 17:18:00 +0000
(17:18 +0000)
committer
Vadim Pisarevsky
<no@email>
Mon, 9 Apr 2012 17:18:00 +0000
(17:18 +0000)
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index
dc2dcea
..
1d1a6a4
100755
(executable)
--- 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,