diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 13:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 13:45:36 +0200 |
| commit | 8e4ecd8774d0841140d4e52e84f6f196c7a7dcfc (patch) | |
| tree | 244589ac1db6d35971da0faebd05c85d74d05b38 /libavcodec/indeo4.c | |
| parent | e3b13c108160869a2dddd1d5bfd42b0b9c917d43 (diff) | |
| parent | 28dda8a691f1c723a4a9365ab85f9625f1330096 (diff) | |
| download | ffmpeg-8e4ecd8774d0841140d4e52e84f6f196c7a7dcfc.tar.gz | |
Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
indeo: Sanitize ff_ivi_init_planes fail paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 127c2fdeab..0f77253f5c 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -210,6 +210,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) { if (ff_ivi_init_planes(ctx->planes, &pic_conf)) { av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n"); + ctx->pic_conf.luma_bands = 0; return AVERROR(ENOMEM); } |