Changeset 588 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncCavlc.h

Timestamp:

1 Feb 2014, 23:50:54 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev

Location:

trunk

Files:

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

trunk/source/Lib/TLibEncoder/TEncCavlc.h

@@ -68 +68 @@
   TComSlice*    m_pcSlice;
   UInt          m_uiCoeffCost;
+#if !P0307_REMOVE_VPS_VUI_OFFSET
 #if VPS_VUI_OFFSET
   Int m_vpsVuiCounter;
+#endif
 #endif
   Void codeShortTermRefPicSet              ( TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Bool calledFromSliceHeader, Int idx );
@@ -95 +97 @@
 #if REPN_FORMAT_IN_VPS
   Void  codeRepFormat           ( RepFormat *repFormat );
+#endif
+#if VPS_DPB_SIZE_TABLE
+  Void  codeVpsDpbSizeTable      (TComVPS *vps);
 #endif
   Void  codeVUI                 ( TComVUI *pcVUI, TComSPS* pcSPS );