[x265] [PATCH] search: remove the merge candidates from the motion candidate list

[gopu at multicorewareinc.com]

# HG changeset patch
# User Gopu Govindaswamy <gopu at multicorewareinc.com>
# Date 1429699945 -19800
#      Wed Apr 22 16:22:25 2015 +0530
# Node ID 61d6b2ba3206a3ebf7b38118ee62e6c5e64e1c1b
# Parent  6d34a490302ee75f2ddc6ef7d841fb900dce1bb7
search: remove the merge candidates from the motion candidate list

The merge logic is already evaluating the cost of the merge MVs

diff -r 6d34a490302e -r 61d6b2ba3206 source/common/cudata.cpp
--- a/source/common/cudata.cpp	Wed Apr 22 11:52:43 2015 +0530
+++ b/source/common/cudata.cpp	Wed Apr 22 16:22:25 2015 +0530
@@ -1718,7 +1718,7 @@
             int curRefPOC = m_slice->m_refPOCList[picList][refIdx];
             int curPOC = m_slice->m_poc;
 
-            pmv[numMvc++] = amvpCand[num++] = scaleMvByPOCDist(neighbours[MD_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);
+            amvpCand[num++] = scaleMvByPOCDist(neighbours[MD_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);
         }
     }