[FFmpeg-cvslog] lavf/webm_chunk: Fix a memory leak.

Vignesh Venkatasubramanian git at videolan.org
Thu Apr 30 23:44:39 CEST 2015


ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv at google.com> | Thu Apr 30 12:56:24 2015 -0700| [ccb8f674995ded871ac725833b5efefce0ad63de] | committer: Michael Niedermayer

lavf/webm_chunk: Fix a memory leak.

Fix a duplicate memory allocation. priv_data should be allocated
in line 64 call to avformat_alloc_output_context2 since we pass
the correct AVFormat to it. This removes the duplicate allocation.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv at google.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccb8f674995ded871ac725833b5efefce0ad63de
---

 libavformat/webm_chunk.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index 8e03270..c7cc0b8 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -70,11 +70,6 @@ static int chunk_mux_init(AVFormatContext *s)
     oc->max_delay          = s->max_delay;
     av_dict_copy(&oc->metadata, s->metadata, 0);
 
-    oc->priv_data = av_mallocz(oc->oformat->priv_data_size);
-    if (!oc->priv_data) {
-        avio_close(oc->pb);
-        return AVERROR(ENOMEM);
-    }
     *(const AVClass**)oc->priv_data = oc->oformat->priv_class;
     av_opt_set_defaults(oc->priv_data);
     av_opt_set_int(oc->priv_data, "dash", 1, 0);



More information about the ffmpeg-cvslog mailing list