diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:20:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:21:39 +0200 |
| commit | 49f1b869b60f27ac450f3db301b46d56e5d5aca6 (patch) | |
| tree | 9d55eb8807eb7f006348de0c59fe44afe678d413 | |
| parent | 32365667ccebab599eabf5f99ed0cdea20d29750 (diff) | |
| parent | 0ef256d51518f0e483c38b9ee3b993cf0709d00e (diff) | |
| download | ffmpeg-49f1b869b60f27ac450f3db301b46d56e5d5aca6.tar.gz | |
Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'
* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
libx264: Correctly manage constant rate factor params
Conflicts:
libavcodec/libx264.c
See: 3a1c8951bc886e8af30e09dc0e20491f6f5c3937
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libx264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5d1e203a7f..edf6fc6130 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -207,8 +207,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x264_encoder_reconfig(x4->enc, &x4->params); } - if (x4->params.rc.i_rc_method == X264_RC_CRF && - x4->crf >= 0 && + if (x4->crf >= 0 && + x4->params.rc.i_rc_method == X264_RC_CRF && x4->params.rc.f_rf_constant != x4->crf) { x4->params.rc.f_rf_constant = x4->crf; x264_encoder_reconfig(x4->enc, &x4->params); |