Merge pull request #1799 from SpecLad:avformat-53-6

11 years ago · 2e79dde357
parent 01f8645bc8 3b7acf2657
commit 2e79dde357
1 changed files with 2 additions and 2 deletions
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@ -546,7 +546,7 @@ bool CvCapture_FFMPEG::open( const char* _filename )
        goto exit_func;
    }
    err =
-#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
    avformat_find_stream_info(ic, NULL);
 #else
    av_find_stream_info(ic);
@ -2114,7 +2114,7 @@ bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma
    if (err < 0)
        return false;
-    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
+    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
        err = avformat_find_stream_info(ctx_, 0);
    #else
        err = av_find_stream_info(ctx_);