Changeset 415 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib

Timestamp:

8 Oct 2013, 18:04:32 (11 years ago)

Author:

seregin

Message:

fix compilation errors

Location:

branches/SHM-3.1-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (3 diffs)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -1883 +1883 @@
 }
 #endif
-<<<<<<< .mine
 
 #if IL_SL_SIGNALLING_N0371
@@ -1906 +1905 @@
 #endif
 
-=======
 #if VIEW_ID_RELATED_SIGNALING 
 Int TComVPS::getNumViews()
@@ -1940 +1938 @@
 }
 #endif
->>>>>>> .r413
 // ------------------------------------------------------------------------------------------------
 // Sequence parameter set (SPS)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -593 +593 @@
   Int         m_avgPicRate          [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER];
 #endif
-<<<<<<< .mine
-
-=======
 #if REPN_FORMAT_IN_VPS
   Bool       m_repFormatIdxPresentFlag;
@@ -606 +603 @@
   Int         m_viewIdVal                [MAX_LAYERS];
 #endif
->>>>>>> .r413
 public:
   TComVPS();

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -60 +60 @@
 #define TEMP_SCALABILITY_FIX             1      ///< fix for temporal scalability
 #endif
-<<<<<<< .mine
 #define IL_SL_SIGNALLING_N0371           1      ///< JCTVC-N0371: inter-layer scaling list
 #define M0464_TILE_BOUNDARY_ALIGNED_FLAG 0      ///< VUI flag to indicate tile boundary alignment
-=======
->>>>>>> .r413
 #define M0463_VUI_EXT_ILP_REF            0      ///< VUI extension inter-layer dependency offset signalling
 #define SPS_EXTENSION                    1      ///< Define sps_extension() syntax structure