From 46c78429949239ec4eea23406332c4ae747ac8f2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Mar 2012 10:13:27 +0100 Subject: ituh263dec: Implement enough of Annex O (scalability) to fix a FPE. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/ituh263dec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libavcodec/ituh263dec.c') diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 0c3cf2fc89..a16b17f4b5 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1085,6 +1085,20 @@ int ff_h263_decode_picture_header(MpegEncContext *s) 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 */ while (get_bits1(&s->gb) != 0) { skip_bits(&s->gb, 8); -- cgit v1.2.3