From d11746e56d46dc3679df5871aef6c1da5f8d0f99 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Fri, 9 Aug 2013 11:46:46 +0200 Subject: [PATCH] Added fix mentioned in bug #3206 VideoWriter memory leak solved. --- modules/highgui/src/cap_ffmpeg_impl.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index d494948..84222ad 100644 --- a/modules/highgui/src/cap_ffmpeg_impl.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl.hpp @@ -1362,8 +1362,6 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int /// close video output stream and free associated memory void CvVideoWriter_FFMPEG::close() { - unsigned i; - // nothing to do if already released if ( !picture ) return; @@ -1419,13 +1417,6 @@ void CvVideoWriter_FFMPEG::close() av_free(outbuf); - /* free the streams */ - for(i = 0; i < oc->nb_streams; i++) - { - av_freep(&oc->streams[i]->codec); - av_freep(&oc->streams[i]); - } - if (!(fmt->flags & AVFMT_NOFILE)) { /* close the output file */ @@ -1443,7 +1434,7 @@ void CvVideoWriter_FFMPEG::close() } /* free the stream */ - av_free(oc); + avformat_free_context(oc); if( temp_image.data ) { -- 2.7.4