Changeset 78 in SHVCSoftware for trunk


Ignore:
Timestamp:
12 Mar 2013, 17:12:41 (12 years ago)
Author:
seregin
Message:

reintegrate SHM-1.1-dev branch

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source

  • trunk/source/Lib/TLibCommon/TypeDef.h

    r55 r78  
    6565#endif
    6666
     67#if SVC_UPSAMPLING
     68#define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
     69#endif
     70
    6771#if REF_IDX_FRAMEWORK
    6872#define REF_IDX_ME_AROUND_ZEROMV         0      ///< added ME around zero MV for inter-layer reference picture
     
    9195#define SVC_BL_CAND_INTRA                0      ///< Intra Base Mode Prediction hook as an example
    9296#endif
    93 #endif
    94 
    95 #if SVC_UPSAMPLING
    96 #define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
    9797#endif
    9898
Note: See TracChangeset for help on using the changeset viewer.