Disable overflow compensation in CRF mode

Wasn't designed with CRF in mind, and acts really weird with CRF+VBV.

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 2b148637405ad825aebb5c925d3d320dd27e6af1..ce57b1867d7e8307b69cd08c06d2e9d6fe4ea469 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -2206,7 +2206,7 @@ static float rate_estimate_qscale( x264_t *h )
                 q = qp2qscale( rcc->accum_p_qp / rcc->accum_p_norm );
                 q /= fabs( h->param.rc.f_ip_factor );
             }
-            else if( h->i_frame > 0 )
+            else if( h->param.rc.i_rc_method != X264_RC_CRF && h->i_frame > 0 )
             {
                 /* Asymmetric clipping, because symmetric would prevent
                  * overflow control in areas of rapidly oscillating complexity */