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

Nicolas George git at videolan.org
Tue Jan 7 21:35:32 CET 2014


ffmpeg | branch: release/2.1 | Nicolas George <george at nsup.org> | Sun Dec 29 10:50:24 2013 +0100| [4b25b5a8a3c0f17f4821e0a943d47ca9781da8d2] | committer: Michael Niedermayer

lavc/libopenjpegenc: check av_frame_alloc() failure.
(cherry picked from commit 97af2faaba70c866ae4c11459a79a16d4a014530)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/libopenjpegenc.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 8aa2b01..6c5aab1 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -502,6 +502,8 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     case AV_PIX_FMT_GBRP14:
     case AV_PIX_FMT_GBRP16:
         gbrframe = av_frame_alloc();
+        if (!gbrframe)
+            return AVERROR(ENOMEM);
         av_frame_ref(gbrframe, frame);
         gbrframe->data[0] = frame->data[2]; // swap to be rgb
         gbrframe->data[1] = frame->data[0];



More information about the ffmpeg-cvslog mailing list