[x265] [PATCH] param: remove --aq-mode 1 from --tune grain

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1425070854 21600
#      Fri Feb 27 15:00:54 2015 -0600
# Node ID b248791e69986760457924ce2b31d2ca8ce1ad8d
# Parent  586fdd2b90a7e56f7e04e181091b2956c6dc750c
param: remove --aq-mode 1 from --tune grain

--aq-mode 1 is now our default, so setting it to 1 here can only over-ride a
user's explicit request for aq-mode 0 or 2

diff -r 586fdd2b90a7 -r b248791e6998 doc/reST/presets.rst
--- a/doc/reST/presets.rst	Thu Feb 26 16:37:50 2015 -0600
+++ b/doc/reST/presets.rst	Fri Feb 27 15:00:54 2015 -0600
@@ -122,7 +122,6 @@
 It lowers the strength of adaptive quantization, so residual energy can
 be more evenly distributed across the (noisy) picture:
 
-    * :option:`--aq-mode` 1
     * :option:`--aq-strength` 0.3
 
 And it similarly tunes rate control to prevent the slice QP from
diff -r 586fdd2b90a7 -r b248791e6998 source/common/param.cpp
--- a/source/common/param.cpp	Thu Feb 26 16:37:50 2015 -0600
+++ b/source/common/param.cpp	Fri Feb 27 15:00:54 2015 -0600
@@ -425,7 +425,6 @@
             param->psyRd = 0.5;
             param->rc.ipFactor = 1.1;
             param->rc.pbFactor = 1.1;
-            param->rc.aqMode = X265_AQ_VARIANCE;
             param->rc.aqStrength = 0.3;
             param->rc.qCompress = 0.8;
         }