summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 23:18:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 23:19:06 +0200
commit73b1283012cfe89e466fa34da0b2ac1e9fb9893d (patch)
tree5f7728b12d91dae5d90e796f17110e0f6129a0d1 /libavformat/mov.c
parent81babc432ab2faf42c2e7bc96d291a3e8f118c75 (diff)
parentedb1af7c466ebb28bfdb0c076e498e527b43d24f (diff)
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 85dc5cf47a..9b4832fb34 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3477,12 +3477,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);