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

1c616f43 · Alexander Reshetnikov · 4a41107b · 1c616f43
隐藏空白更改
内联并排

Showing with 10 addition and 2 deletion

modules/highgui/src/cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +10 -2

未找到文件。
--- 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