From 018e2b57ca8318ae2eaa72e22520d53ffb3404c7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 25 Jan 2014 16:19:39 +0100 Subject: [PATCH] avcodec/libx264: also consider ticks per frame for fps/timebase setup Setting fps = 1/timebase is not correct Signed-off-by: Michael Niedermayer --- libavcodec/libx264.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 8da18707eb..60076301a6 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -557,8 +557,10 @@ static av_cold int X264_init(AVCodecContext *avctx) av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096); x4->params.vui.i_sar_width = sw; x4->params.vui.i_sar_height = sh; - x4->params.i_fps_num = x4->params.i_timebase_den = avctx->time_base.den; - x4->params.i_fps_den = x4->params.i_timebase_num = avctx->time_base.num; + x4->params.i_timebase_den = avctx->time_base.den; + x4->params.i_timebase_num = avctx->time_base.num; + x4->params.i_fps_num = avctx->time_base.den; + x4->params.i_fps_den = avctx->time_base.num * avctx->ticks_per_frame; x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;