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

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.cpp (modified) (3 diffs)

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)