Changeset 543 in SHVCSoftware for branches/SHM-4.1-dev/source

Timestamp:

10 Jan 2014, 04:22:54 (11 years ago)

Author:

seregin

Message:

fix compilation issue

Location:

branches/SHM-4.1-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/SHM-4.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2579 +2579 @@
   printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
   printf("REF_IDX_MFM: %d ", REF_IDX_MFM);
-#else
-  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
-#endif
   printf("O0194_DIFFERENT_BITDEPTH_EL_BL: %d ", O0194_DIFFERENT_BITDEPTH_EL_BL);
   printf("O0194_JOINT_US_BITSHIFT: %d ", O0194_JOINT_US_BITSHIFT);
   printf("O0194_WEIGHTED_PREDICTION_CGS: %d ",O0194_WEIGHTED_PREDICTION_CGS);
+#else
+  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
+#endif
   printf("\n\n");
   

branches/SHM-4.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -98 +98 @@
 
 #if VPS_VUI
-#define VPS_VUI_TILES_NOT_IN_USE__FLAG    1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use
-#define VPS_VUI_WPP_NOT_IN_USE__FLAG    1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use
+#define VPS_VUI_TILES_NOT_IN_USE__FLAG   1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use
+#define VPS_VUI_WPP_NOT_IN_USE__FLAG     1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use
 #define TILE_BOUNDARY_ALIGNED_FLAG       1      ///< JCTVC-N0160/JCTVC-N0199 proposal 2 variant 2: VPS VUI flag to indicate tile boundary alignment
 #define N0160_VUI_EXT_ILP_REF            1      ///< VUI extension inter-layer dependency offset signalling