generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roman Donchenko 2013-11-15 11:51:59 +04:00 committed by OpenCV Buildbot
commit 2e79dde357
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -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
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_);