[x265] [PATCH] encoder: explicitly disable AMP if rectangular modes are disabled

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1379964419 18000
#      Mon Sep 23 14:26:59 2013 -0500
# Node ID 0656b16f0c4acc3f158a54b52331783fec0a5691
# Parent  98903821e0dce2d23d1d4ffdf9e12098c986446f
encoder: explicitly disable AMP if rectangular modes are disabled

In the mode decision logic, asymmetrical motion prediction is implicitly
disabled when rectangular modes are disabled. This makes the disabling more
explicit, AMP will not appear as enabled in the "encoding tools" log line.

diff -r 98903821e0dc -r 0656b16f0c4a source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Mon Sep 23 12:37:26 2013 +0800
+++ b/source/encoder/encoder.cpp	Mon Sep 23 14:26:59 2013 -0500
@@ -213,6 +213,10 @@
     {
         _param->keyframeMin = _param->keyframeMax;
     }
+    if (!_param->bEnableRectInter)
+    {
+        _param->bEnableAMP = false;
+    }
     // if a bitrate is specified, chose ABR.  Else default to CQP
     if (_param->rc.bitrate)
     {