[x265] [PATCH ] Remove redundant settings from performance presets

[tom.vaughan at multicorewareinc.com]

# HG changeset patch
# User Tom Vaughan (tom.vaughan at multicorewareinc.com)
# Date 1392340828 28800
#      Thu Feb 13 17:20:28 2014 -0800
# Node ID 2b8fd56caeda1c8fccb17d2c3f6744fd6a443c7b
# Parent  27c3cc74b360335d36f56127733314546508f7d7
Remove redundant settings from performance presets

diff -r 27c3cc74b360 -r 2b8fd56caeda source/common/common.cpp
--- a/source/common/common.cpp	Thu Feb 13 17:07:40 2014 -0800
+++ b/source/common/common.cpp	Thu Feb 13 17:20:28 2014 -0800
@@ -283,7 +283,6 @@
             param->searchRange = 25;
             param->bFrameAdaptive = 0;
             param->subpelRefine = 0;
-            param->maxNumMergeCand = 2;
             param->searchMethod = X265_DIA_SEARCH;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;