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


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

    r414 r415  
    18831883}
    18841884#endif
    1885 <<<<<<< .mine
    18861885
    18871886#if IL_SL_SIGNALLING_N0371
     
    19061905#endif
    19071906
    1908 =======
    19091907#if VIEW_ID_RELATED_SIGNALING
    19101908Int TComVPS::getNumViews()
     
    19401938}
    19411939#endif
    1942 >>>>>>> .r413
    19431940// ------------------------------------------------------------------------------------------------
    19441941// Sequence parameter set (SPS)
  • TabularUnified branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h

    r414 r415  
    593593  Int         m_avgPicRate          [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER];
    594594#endif
    595 <<<<<<< .mine
    596 
    597 =======
    598595#if REPN_FORMAT_IN_VPS
    599596  Bool       m_repFormatIdxPresentFlag;
     
    606603  Int         m_viewIdVal                [MAX_LAYERS];
    607604#endif
    608 >>>>>>> .r413
    609605public:
    610606  TComVPS();
  • TabularUnified branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

    r414 r415  
    6060#define TEMP_SCALABILITY_FIX             1      ///< fix for temporal scalability
    6161#endif
    62 <<<<<<< .mine
    6362#define IL_SL_SIGNALLING_N0371           1      ///< JCTVC-N0371: inter-layer scaling list
    6463#define M0464_TILE_BOUNDARY_ALIGNED_FLAG 0      ///< VUI flag to indicate tile boundary alignment
    65 =======
    66 >>>>>>> .r413
    6764#define M0463_VUI_EXT_ILP_REF            0      ///< VUI extension inter-layer dependency offset signalling
    6865#define SPS_EXTENSION                    1      ///< Define sps_extension() syntax structure
Note: See TracChangeset for help on using the changeset viewer.