Skip to content

O
opencv
Commit 1c616f43 authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

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

parent 4a41107b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 1c616f43
...@@ -343,7 +343,11 @@ bool CvCapture_FFMPEG::reopen() ...@@ -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 ) ...@@ -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
......
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