highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rv34: check that subsequent slices have the same type as first one.

Browse Source 
This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 23a1f0c592)
This commit is contained in:
Kostya Shishkov
2011-09-12 11:39:53 +02:00
committed by Michael Niedermayer
parent b1ceca016a
commit ad6177e52c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/rv34.c
View File

@@ -1305,6 +1305,13 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
r->next_pts = r->cur_pts; r->next_pts = r->cur_pts;
} }
s->mb_x = s->mb_y = 0; s->mb_x = s->mb_y = 0;
} else {
int slice_type = r->si.type ? r->si.type : AV_PICTURE_TYPE_I;
if (slice_type != s->pict_type) {
av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
return AVERROR_INVALIDDATA;
}
} }
r->si.end = end; r->si.end = end;