Commit 46c78429 authored by Michael Niedermayer's avatar Michael Niedermayer

ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent cc415956
...@@ -1085,6 +1085,20 @@ int ff_h263_decode_picture_header(MpegEncContext *s) ...@@ -1085,6 +1085,20 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
skip_bits(&s->gb, 2); /* Quantization information for B-pictures */ skip_bits(&s->gb, 2); /* Quantization information for B-pictures */
} }
if (s->pict_type!=AV_PICTURE_TYPE_B) {
s->time= s->picture_number;
s->pp_time= s->time - s->last_non_b_time;
s->last_non_b_time= s->time;
}else{
s->time= s->picture_number;
s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
s->pp_time = 2;
s->pb_time = 1;
}
ff_mpeg4_init_direct_mv(s);
}
/* PEI */ /* PEI */
while (get_bits1(&s->gb) != 0) { while (get_bits1(&s->gb) != 0) {
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
......
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