Merge commit '9b8c8a9395c849639aea0f6b5300e991e93c3a73'

[ffmpeg] / libavcodec / mjpega_dump_header_bsf.c

diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/mjpega_dump_header_bsf.c
index 3947c821a8bf34286afee6b18631fb7ee91bc0ad..87829fae8f171e41bb097c641b143d225527e34d 100644 (file)
--- a/libavcodec/mjpega_dump_header_bsf.c
+++ b/libavcodec/mjpega_dump_header_bsf.c
@@ -45,6 +45,8 @@ static int mjpega_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *av
 
     *poutbuf_size = 0;
     *poutbuf = av_malloc(buf_size + 44 + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!*poutbuf)
+        return AVERROR(ENOMEM);
     poutbufp = *poutbuf;
     bytestream_put_byte(&poutbufp, 0xff);
     bytestream_put_byte(&poutbufp, SOI);