From c98d3056cf0235340cf2918fc73151a6db5b4fb3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 4 Jan 2013 16:37:20 +0100 Subject: [PATCH] msrle: fix small palette handling Fixes second file in Ticket1273 Signed-off-by: Michael Niedermayer --- libavcodec/msrle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index a1ef037e49..5b7ba7fdad 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -73,8 +73,8 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx) avcodec_get_frame_defaults(&s->frame); s->frame.data[0] = NULL; - if (avctx->extradata_size >= AVPALETTE_SIZE) - for (i = 0; i < AVPALETTE_SIZE/4; i++) + if (avctx->extradata_size >= 4) + for (i = 0; i < FFMIN(avctx->extradata_size, AVPALETTE_SIZE)/4; i++) s->pal[i] = 0xFFU<<24 | AV_RL32(avctx->extradata+4*i); return 0;