[x265] [PATCH 1 of 4] compress: save CABAC context in merge modes for lower RD levels

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1405044766 -19800
#      Fri Jul 11 07:42:46 2014 +0530
# Node ID 52cda492abf57f7d81fbccbe7e667bfba0946d54
# Parent  e3e077965c39a56a24e09189652e1de3c5a0e3ea
compress: save CABAC context in merge modes for lower RD levels.

diff -r e3e077965c39 -r 52cda492abf5 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Thu Jul 10 19:29:46 2014 -0500
+++ b/source/encoder/compress.cpp	Fri Jul 11 07:42:46 2014 +0530
@@ -320,8 +320,8 @@
             {
                 //No-residue mode
                 m_search->encodeResAndCalcRdInterCU(outBestCU, m_origYuv[depth], bestPredYuv, m_tmpResiYuv[depth], m_bestResiYuv[depth], m_tmpRecoYuv[depth], true, true);
-
                 std::swap(yuvReconBest, m_tmpRecoYuv[depth]);
+                m_rdSbacCoders[depth][CI_TEMP_BEST].store(m_rdSbacCoders[depth][CI_NEXT_BEST]);
             }
 
             //Encode with residue
@@ -333,6 +333,7 @@
             {
                 std::swap(outBestCU, outTempCU);
                 std::swap(yuvReconBest, m_tmpRecoYuv[depth]);
+                m_rdSbacCoders[depth][CI_TEMP_BEST].store(m_rdSbacCoders[depth][CI_NEXT_BEST]);
             }
         }
     }