From 82a2a50f874770cc6bc79cade8a38267714c723c Mon Sep 17 00:00:00 2001 From: Alexander Reshetnikov Date: Wed, 21 Mar 2012 12:54:52 +0000 Subject: [PATCH] Updated new ffmpeg wrapper --- modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index de5a230..ddf3032 100755 --- 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 >= ((53<<16)+(6<<8)+0) + #if LIBAVCODEC_VERSION_INT >= ((52<<16)+(123<<8)+0) frame.width = picture->width; frame.height = picture->height; -- 2.7.4