From 1c616f43ba808c7e403d9106072a7f237d1030ad Mon Sep 17 00:00:00 2001 From: Alexander Reshetnikov Date: Sat, 31 Mar 2012 17:06:35 +0000 Subject: [PATCH] Fixed compilation error with ffmpeg 0.9.x & 0.10.x --- modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index 327dc4c..92135fe 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -343,7 +343,11 @@ bool CvCapture_FFMPEG::reopen() // reopen video avformat_open_input(&ic, filename, NULL, NULL); #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) - avformat_find_stream_info(ic); + #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2) + avformat_find_stream_info(ic); + #else + avformat_find_stream_info(ic, NULL); + #endif #else av_find_stream_info(ic); #endif @@ -404,7 +408,11 @@ bool CvCapture_FFMPEG::open( const char* _filename ) } err = #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) - avformat_find_stream_info(ic); + #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2) + avformat_find_stream_info(ic); + #else + avformat_find_stream_info(ic, NULL); + #endif #else av_find_stream_info(ic); #endif -- 2.7.4