diff options
| author | John Van Sickle <john.vansickle@gmail.com> | 2012-09-25 12:29:22 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-23 13:34:52 +0100 |
| commit | 2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2 (patch) | |
| tree | 23f5eef990d0a460d39abf5ada749b7b1da978bb /libavcodec | |
| parent | d8a74d1d95a3ac37d3f9807499630277ad983c51 (diff) | |
| download | ffmpeg-2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2.tar.gz | |
libx264: change i_qfactor to use x264cli's default
This also allows libx264 to modify its i_qfactor value
when using the "-tune" setting. Previously it had a static
value of 1.25
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 17926627f5..bb92110801 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -279,7 +279,8 @@ static av_cold int X264_init(AVCodecContext *avctx) (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size; } - x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); + if (avctx->i_quant_factor > 0) + x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_pb_factor = avctx->b_quant_factor; x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; @@ -559,6 +560,7 @@ static const AVCodecDefault x264_defaults[] = { { "b", "0" }, { "bf", "-1" }, { "g", "-1" }, + { "i_qfactor", "-1" }, { "qmin", "-1" }, { "qmax", "-1" }, { "qdiff", "-1" }, |