From 658c5afaa01085cc9f8e905a36e211ccf4aea332 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Sat, 1 Oct 2016 10:48:44 +0200 Subject: [PATCH] vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext (cherry picked from commit 17a0f9481cf07af0feb3838ca315b970117e8000) --- libavcodec/vaapi_encode_h264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 02836b0cf6..b8fa909ecc 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -835,8 +835,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) vseq->vui_fields.bits.timing_info_present_flag = 1; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { - vseq->num_units_in_tick = avctx->framerate.num; - vseq->time_scale = 2 * avctx->framerate.den; + vseq->num_units_in_tick = avctx->framerate.den; + vseq->time_scale = 2 * avctx->framerate.num; mseq->fixed_frame_rate_flag = 1; } else { vseq->num_units_in_tick = avctx->time_base.num;