Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / oggparsecelt.c

diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index 4b6233e0c74f819c686379ca3f27e10146a2d61c..f3c2c1a632f9edfec4ec820ba449f74907321c95 100644 (file)
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -46,7 +46,9 @@ static int celt_header(AVFormatContext *s, int idx)
         uint32_t overlap, extra_headers;
 
         priv = av_malloc(sizeof(struct oggcelt_private));
-        if (!priv || ff_alloc_extradata(st->codec, 2 * sizeof(uint32_t)))
+        if (!priv)
+            return AVERROR(ENOMEM);
+        if (ff_alloc_extradata(st->codec, 2 * sizeof(uint32_t)) < 0)
             return AVERROR(ENOMEM);
         version          = AV_RL32(p + 28);
         /* unused header size field skipped */