[x265] [PATCH 3 of 4] encoder: disable some params implicitly if they are for disabled features

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1426638532 18000
#      Tue Mar 17 19:28:52 2015 -0500
# Node ID abcd1ace8a5a9fe7782cbb1baa157be331e6c952
# Parent  b0e2a02c92fb8387c5f29eb6190ec281906818cb
encoder: disable some params implicitly if they are for disabled features

diff -r b0e2a02c92fb -r abcd1ace8a5a source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Tue Mar 17 19:28:10 2015 -0500
+++ b/source/encoder/encoder.cpp	Tue Mar 17 19:28:52 2015 -0500
@@ -1745,6 +1745,10 @@
             x265_log(p, X265_LOG_WARNING, "--tune %s should be used if attempting to benchmark %s!\n", s, s);
     }
 
+    /* some options make no sense if others are disabled */
+    p->bSaoNonDeblocked &= p->bEnableSAO;
+    p->bEnableTSkipFast &= p->bEnableTransformSkip;
+
     /* initialize the conformance window */
     m_conformanceWindow.bEnabled = false;
     m_conformanceWindow.rightOffset = 0;