[x265] [PATCH 2 of 4] compress: save CABAC context after inter/merge decision

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1405045050 -19800
#      Fri Jul 11 07:47:30 2014 +0530
# Node ID b728ca41433f15a0fd630286cf579c7fcdb62820
# Parent  52cda492abf57f7d81fbccbe7e667bfba0946d54
compress: save CABAC context after inter/merge decision

diff -r 52cda492abf5 -r b728ca41433f source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Fri Jul 11 07:42:46 2014 +0530
+++ b/source/encoder/compress.cpp	Fri Jul 11 07:47:30 2014 +0530
@@ -488,6 +488,10 @@
                         std::swap(m_bestPredYuv[depth], m_modePredYuv[3][depth]);
                         std::swap(m_bestRecoYuv[depth], m_bestMergeRecoYuv[depth]);
                     }
+                    else
+                    {
+                        m_rdSbacCoders[depth][CI_TEMP_BEST].store(m_rdSbacCoders[depth][CI_NEXT_BEST]);
+                    }
                 }
 
                 /* Check for Intra in inter frames only if its a P-slice*/