RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libx264: fix -b_qfactor and -chromaoffset 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Hii 2014-08-26 14:55:14 +08:00 committed by Michael Niedermayer
parent 46ad2c4aed
commit 604c4eab2b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libx264.c
View File

@ -371,8 +371,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER;
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
if (x4->preset || x4->tune) if (x4->preset || x4->tune)
if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) { if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
int i; int i;
@ -430,6 +428,10 @@ static av_cold int X264_init(AVCodecContext *avctx)
if (avctx->i_quant_factor > 0) if (avctx->i_quant_factor > 0)
x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor);
if (avctx->b_quant_factor > 0)
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
if (avctx->chromaoffset)
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
if (avctx->me_method == ME_EPZS) if (avctx->me_method == ME_EPZS)
x4->params.analyse.i_me_method = X264_ME_DIA; x4->params.analyse.i_me_method = X264_ME_DIA;
@ -827,6 +829,7 @@ static const AVCodecDefault x264_defaults[] = {
{ "flags2", "0" }, { "flags2", "0" },
{ "g", "-1" }, { "g", "-1" },
{ "i_qfactor", "-1" }, { "i_qfactor", "-1" },
{ "b_qfactor", "-1" },
{ "qmin", "-1" }, { "qmin", "-1" },
{ "qmax", "-1" }, { "qmax", "-1" },
{ "qdiff", "-1" }, { "qdiff", "-1" },