diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 15:54:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 16:08:36 +0200 |
| commit | 220a15c074876b04760e60aeae5badc7412b2f83 (patch) | |
| tree | 5f7063fa84c972350911957d2d18bdab34e47194 /libavcodec | |
| parent | 09450c55092523d073f7ec415f863531838ca908 (diff) | |
| download | ffmpeg-220a15c074876b04760e60aeae5badc7412b2f83.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.c | 1 | ||||
| -rw-r--r-- | libavcodec/vc1_parser.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b03eb94167..b3955f26de 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -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; } } diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 33e672fa0f..3a2308ecc6 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -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, |