Skip to content

O
opencv
Commit 2e79dde3 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

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

parents 01f8645b 3b7acf26
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ 2e79dde3
...@@ -546,7 +546,7 @@ bool CvCapture_FFMPEG::open( const char* _filename ) ...@@ -546,7 +546,7 @@ bool CvCapture_FFMPEG::open( const char* _filename )
goto exit_func; goto exit_func;
} }
err = 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); avformat_find_stream_info(ic, NULL);
#else #else
av_find_stream_info(ic); av_find_stream_info(ic);
...@@ -2114,7 +2114,7 @@ bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma ...@@ -2114,7 +2114,7 @@ bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma
if (err < 0) if (err < 0)
return false; 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); err = avformat_find_stream_info(ctx_, 0);
#else #else
err = av_find_stream_info(ctx_); err = av_find_stream_info(ctx_);
......
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