generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed compiling error for ffmpeg with libavcodec less than 53.4.0

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-03-19 09:05:55 +00:00
parent 010e73010c
commit 484fe1d598
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View File

@ -651,8 +651,14 @@ cv::Mat CvCapture_FFMPEG_2::read()
avpicture_fill(reinterpret_cast<AVPicture*>(rgb_picture), buffer, PIX_FMT_RGB24, avcodec_context->width, avcodec_context->height);
width = picture->width;
height = picture->height;
#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(4<<8)+0)
width = picture->width;
height = picture->height;
#else
width = avcodec_context->width;
height = avcodec_context->height;
#endif
struct SwsContext * img_convert_ctx = sws_getContext(
width, height,