Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1223)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1224)
@@ -2172,7 +2172,5 @@
   }
  
-#if VPS_DPB_SIZE_TABLE
   codeVpsDpbSizeTable(vps);
-#endif
 
   WRITE_UVLC( vps->getDirectDepTypeLen()-2,                           "direct_dep_type_len_minus2");
@@ -2255,5 +2253,4 @@
 }
 
-#if VPS_DPB_SIZE_TABLE
 Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)
 {
@@ -2288,5 +2285,4 @@
   }
 }
-#endif
 
 Void TEncCavlc::codeVPSVUI (TComVPS *vps)
Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h	(revision 1223)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h	(revision 1224)
@@ -154,13 +154,11 @@
 
 #if SVC_EXTENSION
-  Void  codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow );
-  Void codeSPSExtension        ( TComSPS* pcSPS );
-  Void codeVPSExtension        ( TComVPS* pcVPS );
-  Void codeVPSVUI              ( TComVPS *vps   );
-  Void  codeRepFormat          ( RepFormat *repFormat );
-#if VPS_DPB_SIZE_TABLE
-  Void  codeVpsDpbSizeTable    (TComVPS *vps);
-#endif
-  Void  codeVpsVuiBspHrdParams  (TComVPS * const);
+  Void  codeSliceHeaderExtn  ( TComSlice* slice, Int shBitsWrittenTillNow );
+  Void codeSPSExtension      ( TComSPS* pcSPS );
+  Void codeVPSExtension      ( TComVPS* pcVPS );
+  Void codeVPSVUI            ( TComVPS *vps   );
+  Void codeRepFormat         ( RepFormat *repFormat );
+  Void codeVpsDpbSizeTable   ( TComVPS *vps );
+  Void codeVpsVuiBspHrdParams( TComVPS * const );
 
 #if CGS_3D_ASYMLUT