Changeset 78 in SHVCSoftware for trunk/source

Timestamp:

12 Mar 2013, 17:12:41 (12 years ago)

Author:

seregin

Message:

reintegrate SHM-1.1-dev branch

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/TypeDef.h (modified) (2 diffs)

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -65 +65 @@
 #endif
 
+#if SVC_UPSAMPLING
+#define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
+#endif
+
 #if REF_IDX_FRAMEWORK
 #define REF_IDX_ME_AROUND_ZEROMV         0      ///< added ME around zero MV for inter-layer reference picture
@@ -91 +95 @@
 #define SVC_BL_CAND_INTRA                0      ///< Intra Base Mode Prediction hook as an example 
 #endif
-#endif
-
-#if SVC_UPSAMPLING
-#define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
 #endif