Changeset 415 in SHVCSoftware
- Timestamp:
- 8 Oct 2013, 18:04:32 (11 years ago)
- Location:
- branches/SHM-3.1-dev/source/Lib/TLibCommon
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp
r414 r415 1883 1883 } 1884 1884 #endif 1885 <<<<<<< .mine1886 1885 1887 1886 #if IL_SL_SIGNALLING_N0371 … … 1906 1905 #endif 1907 1906 1908 =======1909 1907 #if VIEW_ID_RELATED_SIGNALING 1910 1908 Int TComVPS::getNumViews() … … 1940 1938 } 1941 1939 #endif 1942 >>>>>>> .r4131943 1940 // ------------------------------------------------------------------------------------------------ 1944 1941 // Sequence parameter set (SPS) -
branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h
r414 r415 593 593 Int m_avgPicRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 594 594 #endif 595 <<<<<<< .mine596 597 =======598 595 #if REPN_FORMAT_IN_VPS 599 596 Bool m_repFormatIdxPresentFlag; … … 606 603 Int m_viewIdVal [MAX_LAYERS]; 607 604 #endif 608 >>>>>>> .r413609 605 public: 610 606 TComVPS(); -
branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h
r414 r415 60 60 #define TEMP_SCALABILITY_FIX 1 ///< fix for temporal scalability 61 61 #endif 62 <<<<<<< .mine63 62 #define IL_SL_SIGNALLING_N0371 1 ///< JCTVC-N0371: inter-layer scaling list 64 63 #define M0464_TILE_BOUNDARY_ALIGNED_FLAG 0 ///< VUI flag to indicate tile boundary alignment 65 =======66 >>>>>>> .r41367 64 #define M0463_VUI_EXT_ILP_REF 0 ///< VUI extension inter-layer dependency offset signalling 68 65 #define SPS_EXTENSION 1 ///< Define sps_extension() syntax structure
Note: See TracChangeset for help on using the changeset viewer.