Changeset 415 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h

Timestamp:

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

Author:

seregin

Message:

fix compilation errors

File:

• branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)

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();