[SCM] libav/experimental: mov: free the dv demux context with avformat_free_context()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:48 UTC 2014


The following commit has been merged in the experimental branch:
commit edb1af7c466ebb28bfdb0c076e498e527b43d24f
Author: Anton Khirnov <anton at khirnov.net>
Date:   Thu Jun 19 08:56:24 2014 +0200

    mov: free the dv demux context with avformat_free_context()

diff --git a/libavformat/mov.c b/libavformat/mov.c
index cc2dc87..fdf9c8d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3040,12 +3040,8 @@ static int mov_read_close(AVFormatContext *s)
     }
 
     if (mov->dv_demux) {
-        for (i = 0; i < mov->dv_fctx->nb_streams; i++) {
-            av_freep(&mov->dv_fctx->streams[i]->codec);
-            av_freep(&mov->dv_fctx->streams[i]);
-        }
-        av_freep(&mov->dv_fctx);
-        av_freep(&mov->dv_demux);
+        avformat_free_context(mov->dv_fctx);
+        mov->dv_fctx = NULL;
     }
 
     av_freep(&mov->trex_data);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list