Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1164)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1165)
@@ -2289,15 +2289,9 @@
 
   WRITE_UVLC( vps->getVpsNonVuiExtLength(), "vps_non_vui_extension_length" );
-#if P0307_VPS_NON_VUI_EXT_UPDATE
-  for (i = 1; i <= vps->getVpsNonVuiExtLength(); i++)
+
+  for( i = 1; i <= vps->getVpsNonVuiExtLength(); i++ )
   {
     WRITE_CODE(1, 8, "vps_non_vui_extension_data_byte");
   }
-#else
-  if ( vps->getVpsNonVuiExtLength() > 0 )
-  {
-    printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
-  }
-#endif
 
   vps->setVpsVuiPresentFlag(true);