OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a91394f
)
lavc/libopenjpegenc: check av_frame_alloc() failure.
author
Nicolas George
<george@nsup.org>
Sun, 29 Dec 2013 09:50:24 +0000
(10:50 +0100)
committer
Nicolas George
<george@nsup.org>
Mon, 30 Dec 2013 09:58:02 +0000
(10:58 +0100)
libavcodec/libopenjpegenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/libopenjpegenc.c
b/libavcodec/libopenjpegenc.c
index
0205c7d
..
e056dd7
100644
(file)
--- 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];