Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'

[ffmpeg.git] / libavformat / smacker.c

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index e04a214ff3a080dc38e4b38d4446a80e0ce2991d..7132a855654e78d5a0c730a082dd7de4145f380b 100644 (file)
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -210,7 +210,8 @@ static int smacker_read_header(AVFormatContext *s)
 
 
     /* load trees to extradata, they will be unpacked by decoder */
-    st->codec->extradata = av_malloc(smk->treesize + 16 + FF_INPUT_BUFFER_PADDING_SIZE);
+    st->codec->extradata = av_mallocz(smk->treesize + 16 +
+                                      FF_INPUT_BUFFER_PADDING_SIZE);
     st->codec->extradata_size = smk->treesize + 16;
     if(!st->codec->extradata){
         av_log(s, AV_LOG_ERROR, "Cannot allocate %i bytes of extradata\n", smk->treesize + 16);