diff options
| author | Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> | 2016-01-15 15:53:46 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-01-19 20:47:49 +0100 |
| commit | 472d488ebcc53bea4cdb124edb94558e72d8f23f (patch) | |
| tree | e7ef40e3495a03daf4ed09b2bfda258004335750 | |
| parent | 7486418683bd2477772e03aab573cf846c12fb0d (diff) | |
| download | ffmpeg-472d488ebcc53bea4cdb124edb94558e72d8f23f.tar.gz | |
libkvazaar: Set frame rate as a rational number
Updates libkvazaar to pass the exact frame rate to Kvazaar by setting
the numerator and denominator separately instead of a single floating
point number. The exact frame rate is needed for writing timing info to
the bitstream.
Requires Kvazaar version 0.8.1.
Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/libkvazaar.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -4482,7 +4482,7 @@ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do check_lib "${gsm_hdr}" gsm_create -lgsm && break; done || die "ERROR: libgsm not found"; } enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc -enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.1" kvazaar.h kvz_api_get +enabled libkvazaar && require_pkg_config "kvazaar >= 0.8.1" kvazaar.h kvz_api_get enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 89b024a379..19122e0717 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -80,8 +80,8 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) cfg->width = avctx->width; cfg->height = avctx->height; - cfg->framerate = - avctx->time_base.den / (double)(avctx->time_base.num * avctx->ticks_per_frame); + cfg->framerate_num = avctx->time_base.den; + cfg->framerate_denom = avctx->time_base.num * avctx->ticks_per_frame; cfg->target_bitrate = avctx->bit_rate; cfg->vui.sar_width = avctx->sample_aspect_ratio.num; cfg->vui.sar_height = avctx->sample_aspect_ratio.den; |