Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 952)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 953)
@@ -127,4 +127,7 @@
   m_confModeFlag = false;
 #endif
+#if FIX_NON_OUTPUT_LAYER
+  m_isOutputLayerFlag = false;
+#endif
 }
 
@@ -569,4 +572,11 @@
   // Execute Deblock + Cleanup
   m_cGopDecoder.filterPicture(pcPic);
+
+#if FIX_NON_OUTPUT_LAYER
+  if( this->getLayerDec(pcPic->getLayerId())->m_isOutputLayerFlag == false )
+  {
+    pcPic->setOutputMark( false );
+  }
+#endif
 
   TComSlice::sortPicList( m_cListPic ); // sorting for application output
@@ -2913,5 +2923,7 @@
   CommonDecoderParams* params = this->getCommonDecoderParams();
 
+#if !FIX_CONF_MODE
   assert( params->getTargetLayerId() < vps->getMaxLayers() );
+#endif
 
   if( params->getValueCheckedFlag() )
@@ -3016,4 +3028,14 @@
   Int targetLsIdx = vps->getOutputLayerSetIdx( targetOlsIdx );
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
+#endif
+#if FIX_NON_OUTPUT_LAYER
+  // Check if the current layer is an output layer
+  for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
+  {
+    if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
+    {
+      this->getLayerDec( vps->getLayerSetLayerIdList( targetLsIdx, i ) )->m_isOutputLayerFlag = true;
+    }
+  }
 #endif
 }
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 952)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 953)
@@ -171,4 +171,7 @@
   std::vector<TComPic>   m_confListPic;         //  Dynamic buffer for storing pictures for conformance purposes
 #endif
+#if FIX_NON_OUTPUT_LAYER
+  Bool m_isOutputLayerFlag;
+#endif
 public:
 #if POC_RESET_RESTRICTIONS