projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c050631
)
Updated new ffmpeg wrapper
author
Alexander Reshetnikov
<no@email>
Wed, 21 Mar 2012 12:54:52 +0000
(12:54 +0000)
committer
Alexander Reshetnikov
<no@email>
Wed, 21 Mar 2012 12:54:52 +0000
(12:54 +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
de5a230
..
ddf3032
100755
(executable)
--- a/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@
-742,7
+742,7
@@
bool CvCapture_FFMPEG::retrieveFrame(int, unsigned char** data, int* step, int*
avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], PIX_FMT_RGB24, video_st->codec->width, video_st->codec->height);
- #if LIBAVCODEC_VERSION_INT >= ((5
3<<16)+(6
<<8)+0)
+ #if LIBAVCODEC_VERSION_INT >= ((5
2<<16)+(123
<<8)+0)
frame.width = picture->width;
frame.height = picture->height;