Commit bb01be80 authored by Michael Niedermayer's avatar Michael Niedermayer

rv20: Fix handling of frame skip.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7bab631f
...@@ -419,7 +419,8 @@ static int rv20_decode_picture_header(RVDecContext *rv) ...@@ -419,7 +419,8 @@ static int rv20_decode_picture_header(RVDecContext *rv)
if (s->pict_type==AV_PICTURE_TYPE_B) { if (s->pict_type==AV_PICTURE_TYPE_B) {
if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){ if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n"); av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n");
return FRAME_SKIPPED; #define ERROR_SKIP_FRAME -123
return ERROR_SKIP_FRAME;
} }
ff_mpeg4_init_direct_mv(s); ff_mpeg4_init_direct_mv(s);
} }
...@@ -542,7 +543,8 @@ static int rv10_decode_packet(AVCodecContext *avctx, ...@@ -542,7 +543,8 @@ static int rv10_decode_packet(AVCodecContext *avctx,
else else
mb_count = rv20_decode_picture_header(rv); mb_count = rv20_decode_picture_header(rv);
if (mb_count < 0) { if (mb_count < 0) {
av_log(s->avctx, AV_LOG_ERROR, "HEADER ERROR\n"); if (mb_count != ERROR_SKIP_FRAME)
av_log(s->avctx, AV_LOG_ERROR, "HEADER ERROR\n");
return -1; return -1;
} }
......
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