Changeset 773 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCavlc.h

Timestamp:

16 Jan 2014, 09:56:13 (10 years ago)

Author:

tech

Message:

Merged branch/9.2-dev0@722.

File:

• trunk/source/Lib/TLibEncoder/TEncCavlc.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncCavlc.h

@@ -86 +86 @@
 #if H_MV
   Void  codeVPSExtension       ( TComVPS *pcVPS );
-#if H_MV_6_PS_O0118_33
   Void  codeVideoSignalInfo     ( TComVideoSignalInfo* pcVideoSignalInfo ); 
-#endif
 
-#if H_MV_6_HRD_O0217_13
   Void  codeDpbSize   ( TComVPS* vps );
-#endif
 
-#if H_MV_6_PS_REP_FORM_18_19_20
   Void  codeRepFormat           ( Int i, TComRepFormat* curRepFormat, TComRepFormat* prevRepFormat );
-#else
-  Void  codeRepFormat          ( TComRepFormat* pcRepFormat );
-#endif
   Void  codeVPSVUI             ( TComVPS* pcVPS );
-#if H_MV_6_HRD_O0164_15
   Void  codeVpsVuiBspHrdParameters( TComVPS* pcVPS ); 
-#endif
 #endif 
   Void  codeVUI                 ( TComVUI *pcVUI, TComSPS* pcSPS );
@@ -117 +107 @@
   Void  codePPS                 ( TComPPS* pcPPS );
 
-#if DLT_DIFF_CODING_IN_PPS
+#if H_3D
   Void  codePPSExtension        ( TComPPS* pcPPS );
 #endif