Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 856)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 858)
@@ -1143,6 +1143,6 @@
         if( m_apcSlicePilot->getPocResetIdc() == 3 )
         {
-          assert( m_apcSlicePilot->getFullPocResetFlag() == false && m_crossLayerPocResetIdc == 1
-                  || m_apcSlicePilot->getFullPocResetFlag() == true && m_crossLayerPocResetIdc == 2 );
+          assert( ( m_apcSlicePilot->getFullPocResetFlag() == false && m_crossLayerPocResetIdc == 1 ) ||
+                  ( m_apcSlicePilot->getFullPocResetFlag() == true  && m_crossLayerPocResetIdc == 2 ) );
         }
       }
@@ -1733,8 +1733,8 @@
       that is present in the bitstream in the same access unit with a different value of nal_unit_type, 
       the value of poc_reset_idc shall be equal to 1 or 2 for all pictures in the access unit. */
-      if( m_nonBaseIdrPresentFlag && 
-            ( m_nonBaseIdrType == 1 && m_picNonIdrWithRadlPresentFlag  
-             || m_nonBaseIdrType == 0 && m_picNonIdrNoLpPresentFlag )
-        )
+      if( m_nonBaseIdrPresentFlag && (
+            ( m_nonBaseIdrType == 1 && m_picNonIdrWithRadlPresentFlag ) ||
+            ( m_nonBaseIdrType == 0 && m_picNonIdrNoLpPresentFlag )
+        ))
       {
         assert( m_apcSlicePilot->getPocResetIdc() == 1 || m_apcSlicePilot->getPocResetIdc() == 2 );