Fix no-mbtree + aq-mode=0

Regression in r1618.

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 7f1c823022fbd361d8becbbe59a33880fbac293f..3a631f532c1bf15fecd4f9ff30665e0880c507fd 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -254,7 +254,7 @@ void x264_adaptive_quant_frame( x264_t *h, x264_frame_t *frame, float *quant_off
     if( h->param.rc.i_aq_mode == X264_AQ_NONE || h->param.rc.f_aq_strength == 0 )
     {
         /* Need to init it anyways for MB tree */
-        if( h->param.rc.f_aq_strength == 0 )
+        if( h->param.rc.i_aq_mode && h->param.rc.f_aq_strength == 0 )
         {
             if( quant_offsets )
             {