From d788af6cf696d547a442c47e1ce6f93bc9fc97b6 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 18 Sep 2011 00:17:44 +0200 Subject: Reject slices that does not have the same type than the first one in RV10/RV20 decoder. This prevents crashes with some corrupted bitstreams. Signed-off-by: Michael Niedermayer --- libavcodec/rv10.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/rv10.c') diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d53265b418..18a79afbee 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -547,8 +547,12 @@ static int rv10_decode_packet(AVCodecContext *avctx, if(MPV_frame_start(s, avctx) < 0) return -1; ff_er_frame_start(s); + } else { + if (s->current_picture_ptr->f.pict_type != s->pict_type) + return -1; } + av_dlog(avctx, "qscale=%d\n", s->qscale); /* default quantization values */ -- cgit v1.2.3