Skip to content

O
opencv
Commit 2c3a712b authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

Minor refactoring of condition for avformat_find_stream_info (ticket #1790)

parent b3587c9e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 2c3a712b
...@@ -332,12 +332,8 @@ bool CvCapture_FFMPEG::reopen() ...@@ -332,12 +332,8 @@ bool CvCapture_FFMPEG::reopen()
avformat_open_input(&ic, filename, NULL, NULL); avformat_open_input(&ic, filename, NULL, NULL);
#endif #endif
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
avformat_find_stream_info(ic);
#else
avformat_find_stream_info(ic, NULL); avformat_find_stream_info(ic, NULL);
#endif
#else #else
av_find_stream_info(ic); av_find_stream_info(ic);
#endif #endif
...@@ -395,12 +391,8 @@ bool CvCapture_FFMPEG::open( const char* _filename ) ...@@ -395,12 +391,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
goto exit_func; goto exit_func;
} }
err = err =
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0) #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
avformat_find_stream_info(ic);
#else
avformat_find_stream_info(ic, NULL); 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