Commit 4a29b471 authored by Laurent Aimar's avatar Laurent Aimar Committed by Martin Storsjö

rv10: Reject slices that does not have the same type as the first one

This prevents crashes with some corrupted bitstreams.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent ab09df9d
...@@ -531,6 +531,11 @@ static int rv10_decode_packet(AVCodecContext *avctx, ...@@ -531,6 +531,11 @@ 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) {
av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
return -1;
}
} }
av_dlog(avctx, "qscale=%d\n", s->qscale); av_dlog(avctx, "qscale=%d\n", s->qscale);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment