Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp	(revision 807)
+++ branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp	(revision 808)
@@ -125,5 +125,5 @@
 , m_pocMsbValPresentFlag          ( false )
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
 , m_picOrderCntLsb (0)
 #endif
@@ -212,5 +212,5 @@
   m_pocMsbValPresentFlag          = false;
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   m_picOrderCntLsb = 0;
 #endif
@@ -1870,8 +1870,6 @@
     if(isAvailable == 0)    
     {            
-#if UNAVAILABLE_PIC_BUGFIX
-#if 0
+#if !UNAVAILABLE_PIC_BUGFIX
       if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
-#endif
 #endif
       {
@@ -3925,5 +3923,6 @@
   return true;
 #else
-  setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC())); 
+  setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC()));
+  return true;
 #endif
 }
Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h	(revision 807)
+++ branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h	(revision 808)
@@ -1992,5 +1992,5 @@
   Int         m_iAssociatedIRAP;
 #if POC_RESET_IDC_ENCODER
-  Int                     m_associatedIrapPocBeforeReset;
+  Int         m_associatedIrapPocBeforeReset;
 #endif
 
@@ -2124,5 +2124,5 @@
   Int         m_pocValueBeforeReset;
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   Int         m_picOrderCntLsb;
 #endif
@@ -2500,4 +2500,6 @@
   Bool      getRaslPicFlag      ();
   Bool      getRadlPicFlag      ();
+#endif
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   Int       getPicOrderCntLsb() { return m_picOrderCntLsb; }
   Void      setPicOrderCntLsb(Int x) { m_picOrderCntLsb = x; }
Index: branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 807)
+++ branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 808)
@@ -1154,5 +1154,4 @@
   if( m_parseIdc == 1 )
   {
-
     // Invoke output of pictures if the current picture is a POC reset picture
     bNewPOC = true;
Index: branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 807)
+++ branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 808)
@@ -1325,5 +1325,7 @@
     pcSlice->setAssociatedIRAPType(m_associatedIRAPType);
     pcSlice->setAssociatedIRAPPOC(m_associatedIRAPPOC);
+#if POC_RESET_IDC_ENCODER
     pcSlice->setAssociatedIrapPocBeforeReset(m_associatedIrapPocBeforeReset);
+#endif
 #endif
 #endif