[FFmpeg-cvslog] lavc/utils: check av_frame_alloc() failure.

Nicolas George git at videolan.org
Mon Dec 30 13:37:38 CET 2013


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Sun Dec 29 10:42:54 2013 +0100| [38004051b53ddecb518053e6dadafa9adc4fc1b2] | committer: Nicolas George

lavc/utils: check av_frame_alloc() failure.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38004051b53ddecb518053e6dadafa9adc4fc1b2
---

 libavcodec/utils.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c000d27..f660133 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1721,6 +1721,8 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
 
     if (samples) {
         frame = av_frame_alloc();
+        if (!frame)
+            return AVERROR(ENOMEM);
 
         if (avctx->frame_size) {
             frame->nb_samples = avctx->frame_size;
@@ -2158,6 +2160,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
     AVFrame *frame = av_frame_alloc();
     int ret, got_frame = 0;
 
+    if (!frame)
+        return AVERROR(ENOMEM);
     if (avctx->get_buffer != avcodec_default_get_buffer) {
         av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with"
                                     "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n");



More information about the ffmpeg-cvslog mailing list