Fixed [swscaler ...] bad dst image pointers (tickets ##1708, 1755)

0ef71c04 · Alexander Reshetnikov · fa7e7e54 · 0ef71c04
Commit 0ef71c04 authored Apr 05, 2012 by Alexander Reshetnikov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +0 -2

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