Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.h


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (12 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r189 r296  
    5959
    6060// ====================================================================================================================
    61 #if QC_MULTI_DIS_CAN_A0097
     61#if H3D_NBDV
    6262typedef struct _DisCand
    6363{
    … …  
    9494  Int getHor   () const { return  m_acMv.getHor(); }
    9595  Int getVer   () const { return  m_acMv.getVer(); }
    96 #if QC_MRG_CANS_B0048
     96#if H3D_IVMP
    9797  Bool operator== ( const TComMvField& rcMv ) const
    9898  {
Note: See TracChangeset for help on using the changeset viewer.