[x264-devel] commit: Fix no-mbtree + aq-mode=0 (Yusuke Nakamura )

[git at videolan.org]

x264 | branch: master | Yusuke Nakamura <muken.the.vfrmaniac at gmail.com> | Wed Jun  2 22:27:57 2010 +0900| [2e81ce15c161f94053707852c027c123c6812cdf] | committer: Jason Garrett-Glaser 

Fix no-mbtree + aq-mode=0

Regression in r1618.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=2e81ce15c161f94053707852c027c123c6812cdf
---

 encoder/ratecontrol.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index d09de98..9763122 100644
--- 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 )
             {