Ignore:
Timestamp:
21 Jan 2014, 18:47:46 (11 years ago)
Author:
seregin
Message:

merge from trunk

Location:
branches/SHM-5.0-dev/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-5.0-dev/source

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r540 r550  
    25792579  printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
    25802580  printf("REF_IDX_MFM: %d ", REF_IDX_MFM);
    2581 #else
    2582   printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
    2583 #endif
    25842581  printf("O0194_DIFFERENT_BITDEPTH_EL_BL: %d ", O0194_DIFFERENT_BITDEPTH_EL_BL);
    25852582  printf("O0194_JOINT_US_BITSHIFT: %d ", O0194_JOINT_US_BITSHIFT);
    25862583  printf("O0194_WEIGHTED_PREDICTION_CGS: %d ",O0194_WEIGHTED_PREDICTION_CGS);
     2584#else
     2585  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
     2586#endif
    25872587  printf("\n\n");
    25882588 
Note: See TracChangeset for help on using the changeset viewer.