Commit 220a15c0 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/vc1: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 09450c55
......@@ -490,7 +490,6 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
}
}
if (v->broadcast) { // Pulldown may be present
v->s.avctx->framerate.num *= 2;
v->s.avctx->ticks_per_frame = 2;
}
}
......
......@@ -112,6 +112,8 @@ static void vc1_extract_header(AVCodecParserContext *s, AVCodecContext *avctx,
break;
}
if (avctx->framerate.num)
avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1}));
}
static int vc1_parse(AVCodecParserContext *s,
......
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