Skip to content

O
opencv
Commit 484fe1d5 authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

Fixed compiling error for ffmpeg with libavcodec less than 53.4.0

parent 010e7301
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 484fe1d5
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment