Skip to content

O
opencv
Commit 0dd4386d authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file

parent 41158ab5
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 17 deletions
CMakeLists.txt
View file @ 0dd4386d
...@@ -394,9 +394,9 @@ if(UNIX) ...@@ -394,9 +394,9 @@ if(UNIX)
endif() endif()
endif() endif()
#if(HAVE_FFMPEG) if(HAVE_FFMPEG)
#CHECK_MODULE(libavformat>=52.111.0 NEW_FFMPEG) CHECK_MODULE(libavformat>=52.111.0 NEW_FFMPEG)
#endif() endif()
if(WITH_1394) if(WITH_1394)
CHECK_MODULE(libdc1394-2 HAVE_DC1394_2) CHECK_MODULE(libdc1394-2 HAVE_DC1394_2)
......
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 0dd4386d
...@@ -545,11 +545,11 @@ bool CvCapture_FFMPEG::reopen() ...@@ -545,11 +545,11 @@ bool CvCapture_FFMPEG::reopen()
#endif #endif
AVCodec *codec = avcodec_find_decoder(enc->codec_id); AVCodec *codec = avcodec_find_decoder(enc->codec_id);
#if FF_API_AVCODEC_OPEN #if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
avcodec_open(enc, codec); avcodec_open2(enc, codec, NULL);
#else #else
avcodec_open_2(enc, codec, NULL); avcodec_open(enc, codec);
#endif #endif
video_st = ic->streams[video_stream]; video_st = ic->streams[video_stream];
// reset framenumber to zero // reset framenumber to zero
...@@ -742,15 +742,8 @@ bool CvCapture_FFMPEG::retrieveFrame(int, unsigned char** data, int* step, int* ...@@ -742,15 +742,8 @@ 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); avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], PIX_FMT_RGB24, video_st->codec->width, video_st->codec->height);
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(123<<8)+0) frame.width = video_st->codec->width;
frame.height = video_st->codec->height;
frame.width = picture->width;
frame.height = picture->height;
#else
frame.width = video_st->codec->width;
frame.height = video_st->codec->height;
#endif
img_convert_ctx = sws_getContext( img_convert_ctx = sws_getContext(
video_st->codec->width, video_st->codec->height, video_st->codec->width, video_st->codec->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