Ignore:
Timestamp:
14 Feb 2013, 23:41:41 (12 years ago)
Author:
tech
Message:

Integration of branch dev 2.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

    r210 r280  
    404404  pcPicYuvOrg->copyToPic( pcPicCurr->getPicYuvOrg() );
    405405
    406 #if SONY_COLPIC_AVAILABILITY
    407   pcPicCurr->setViewOrderIdx(m_iViewOrderIdx);
     406#if INTER_VIEW_VECTOR_SCALING_C0115
     407  pcPicCurr->setViewOrderIdx(m_iViewOrderIdx);    // will be changed to view_id
    408408#endif
    409409  pcPicCurr->setScaleOffset( m_aaiCodedScale, m_aaiCodedOffset );
Note: See TracChangeset for help on using the changeset viewer.