Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

[ffmpeg] / libavformat / mvi.c

diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 6ab95b90b0d8cb4816402cdca2b0e369f17f8cf8..9184927a2f7b27392bf99ab7b8ed8883ed87580e 100644 (file)
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -54,6 +54,8 @@ static int read_header(AVFormatContext *s)
 
     vst->codec->extradata_size = 2;
     vst->codec->extradata = av_mallocz(2 + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!vst->codec->extradata)
+        return AVERROR(ENOMEM);
 
     version                  = avio_r8(pb);
     vst->codec->extradata[0] = avio_r8(pb);