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

Fixed compilation error with ffmpeg 0.9.x & 0.10.x

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-03-31 17:06:35 +00:00
parent 4a41107b01
commit 1c616f43ba
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,11 @@ bool CvCapture_FFMPEG::reopen()
// reopen video // reopen video
avformat_open_input(&ic, filename, NULL, NULL); avformat_open_input(&ic, filename, NULL, NULL);
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) #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 #else
av_find_stream_info(ic); av_find_stream_info(ic);
#endif #endif
@ -404,7 +408,11 @@ bool CvCapture_FFMPEG::open( const char* _filename )
} }
err = err =
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) #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 #else
av_find_stream_info(ic); av_find_stream_info(ic);
#endif #endif