Changeset 550 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

21 Jan 2014, 18:47:46 (11 years ago)

Author:

seregin

Message:

merge from trunk

Location:

branches/SHM-5.0-dev/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2038 +2038 @@
 , m_moreOutputLayerSetsThanDefaultFlag (false)
 , m_numAddOutputLayerSets     (0)
+#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
+, m_defaultOneTargetOutputLayerIdc     (0)
+#else
 , m_defaultOneTargetOutputLayerFlag    (false)
+#endif
 #if VPS_VUI_BITRATE_PICRATE
 , m_bitRatePresentVpsFlag     (false)
@@ -2048 +2052 @@
 #endif
 #if VIEW_ID_RELATED_SIGNALING 
+#if O0109_VIEW_ID_LEN
+, m_viewIdLen                (0)
+#else
 , m_viewIdLenMinus1           (0)
+#endif
+#endif
+#if VPS_VUI_OFFSET
+, m_vpsVuiOffset (0)
 #endif
 {