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

Merge pull request #3698 from SpecLad:avcodec-free-frame

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-02-16 11:33:00 +00:00
commit 6a3a6416d7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,15 @@ void CvCapture_FFMPEG::close()
} }
if( picture ) if( picture )
{
// FFmpeg and Libav added avcodec_free_frame in different versions.
#if LIBAVCODEC_BUILD >= (LIBAVCODEC_VERSION_MICRO >= 100 \
? CALC_FFMPEG_VERSION(54, 59, 100) : CALC_FFMPEG_VERSION(54, 28, 0))
avcodec_free_frame(&picture);
#else
av_free(picture); av_free(picture);
#endif
}
if( video_st ) if( video_st )
{ {