diff options
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index a3493f393d..45d07a92fc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -821,8 +821,13 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.vui.i_sar_height = sh; 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; + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { + x4->params.i_fps_num = avctx->framerate.num; + x4->params.i_fps_den = avctx->framerate.den; + } else { + 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 & AV_CODEC_FLAG_PSNR; |