virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Reject slices that does not have the same type than the first one in RV10/RV20 decoder.

Browse Source 
This prevents crashes with some corrupted bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Laurent Aimar 2011-09-18 00:17:44 +02:00 committed by Michael Niedermayer
parent eac673d506
commit d788af6cf6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/rv10.c
View File

@ -547,8 +547,12 @@ static int rv10_decode_packet(AVCodecContext *avctx,
if(MPV_frame_start(s, avctx) < 0) if(MPV_frame_start(s, avctx) < 0)
return -1; return -1;
ff_er_frame_start(s); 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); av_dlog(avctx, "qscale=%d\n", s->qscale);
/* default quantization values */ /* default quantization values */