Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'

* commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e': libtheora: Check frame allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 21:38:47 +01:00
parent 9ecfe0b878 17c45d4d05
commit a91c175db2
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -267,6 +267,8 @@ static av_cold int encode_init(AVCodecContext* avc_context)

    /* Set up the output AVFrame */
    avc_context->coded_frame = av_frame_alloc();
+    if (!avc_context->coded_frame)
+        return AVERROR(ENOMEM);

    return 0;
 }