Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 937)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 941)
@@ -1088,5 +1088,9 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
+#if !MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
+#else
+    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -1254,5 +1258,9 @@
 #endif
 #if LIST_OF_PTL
+#if !MULTIPLE_PTL_SUPPORT
   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
+#else
+  //Do something here to make sure the loop is correct to consider base layer internal stuff
+#endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
 #else
@@ -1260,4 +1268,7 @@
 #endif
   {
+#if MULTIPLE_PTL_SUPPORT
+    vps->setProfilePresentFlag(idx, true);
+#endif
     WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
 #if !P0048_REMOVE_PROFILE_REF
@@ -1267,5 +1278,9 @@
     }
 #endif
+#if !MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
+    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif