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:
fa7e7e5
)
Fixed [swscaler ...] bad dst image pointers (tickets ##1708, 1755)
author
Alexander Reshetnikov
<no@email>
Thu, 5 Apr 2012 16:29:42 +0000
(16:29 +0000)
committer
Alexander Reshetnikov
<no@email>
Thu, 5 Apr 2012 16:29:42 +0000
(16:29 +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
4ae0982
..
5dc4d89
100755
(executable)
--- a/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@
-550,8
+550,6
@@
bool CvCapture_FFMPEG::retrieveFrame(int, unsigned char** data, int* step, int*
if( !video_st || !picture->data[0] )
return false;
- rgb_picture = *avcodec_alloc_frame();
-
avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], PIX_FMT_RGB24, video_st->codec->width, video_st->codec->height);
frame.width = video_st->codec->width;