[SCM] libav/experimental: 4xm: allocate extradata properly.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d256ed78ffe202a4dcc8d625becffc716bfa3977
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sat May 3 08:50:41 2014 +0200

    4xm: allocate extradata properly.
    
    Pad it with the required amount of zeros, check for malloc failure.

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 7a87c36..6253ffb 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -110,8 +110,11 @@ static int parse_vtrk(AVFormatContext *s,
 
     st->codec->codec_type     = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id       = AV_CODEC_ID_4XM;
+
+    st->codec->extradata      = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!st->codec->extradata)
+        return AVERROR(ENOMEM);
     st->codec->extradata_size = 4;
-    st->codec->extradata      = av_malloc(4);
     AV_WL32(st->codec->extradata, AV_RL32(buf + 16));
     st->codec->width  = AV_RL32(buf + 36);
     st->codec->height = AV_RL32(buf + 40);

-- 
Libav/FFmpeg packaging