[x265] [PATCH 4 of 4] compress: save CABAC context for rd = 2 after inter/intra encodes

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1405045376 -19800
#      Fri Jul 11 07:52:56 2014 +0530
# Node ID 1c8573c886b1d532fae4cdb154d0ac82d1f31a43
# Parent  65d4f5b4fd3af574cd6ee13cf7bdf3b16329aa00
compress: save CABAC context for rd = 2 after inter/intra encodes

diff -r 65d4f5b4fd3a -r 1c8573c886b1 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Fri Jul 11 07:50:35 2014 +0530
+++ b/source/encoder/compress.cpp	Fri Jul 11 07:52:56 2014 +0530
@@ -552,10 +552,12 @@
 
                         m_search->encodeResAndCalcRdInterCU(outBestCU, m_origYuv[depth], m_bestPredYuv[depth], m_tmpResiYuv[depth],
                                                             m_bestResiYuv[depth], m_bestRecoYuv[depth], false, true);
+                        m_rdSbacCoders[depth][CI_TEMP_BEST].store(m_rdSbacCoders[depth][CI_NEXT_BEST]);
                     }
                     else if (outBestCU->getPredictionMode(0) == MODE_INTRA)
                     {
                         xEncodeIntraInInter(outBestCU, m_origYuv[depth], m_bestPredYuv[depth], m_tmpResiYuv[depth],  m_bestRecoYuv[depth]);
+                        m_rdSbacCoders[depth][CI_TEMP_BEST].store(m_rdSbacCoders[depth][CI_NEXT_BEST]);
                     }
                 }
                 else if (m_param->rdLevel == 1)