diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:42:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:42:16 +0100 |
| commit | 96b495f443832082777d7dad7349dd6ec97b6cb9 (patch) | |
| tree | 67c21ef1c8441d60dcc7054cae839b451d448a75 /libavcodec/libschroedingerdec.c | |
| parent | 0425e16d96cccf6de32231ecfc37cde72985dde5 (diff) | |
| parent | e570f895cdccf2535a71fec1c607751ddb94fd5a (diff) | |
| download | ffmpeg-streaming-96b495f443832082777d7dad7349dd6ec97b6cb9.zip ffmpeg-streaming-96b495f443832082777d7dad7349dd6ec97b6cb9.tar.gz | |
Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
libschroedinger: Check memory allocations
Conflicts:
libavcodec/libschroedinger.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libschroedingerdec.c')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index dca3379..8778869 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -267,6 +267,8 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx, /* Decoder needs a frame - create one and push it in. */ frame = ff_create_schro_frame(avctx, p_schro_params->frame_format); + if (!frame) + return AVERROR(ENOMEM); schro_decoder_add_output_picture(decoder, frame); break; |
