mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a memory leak in CvCapture_FFMPEG::close

Browse Source 
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.

(cherry picked from commit 77578d415f)

Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
This commit is contained in:
Roman Donchenko 2015-02-13 15:12:52 +03:00
parent 1858b5cfba
commit 34ad2e0fa4
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/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -302,7 +302,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 )
{ {