Ignore:
Timestamp:
4 Apr 2014, 16:15:09 (10 years ago)
Author:
rwth
Message:
  • integration of H0057 and H0072
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComDataCU.cpp

    r888 r895  
    39403940      && !bARPFlag
    39413941#endif
     3942#if RWTH_H0057_DBBP_NO_SPU
     3943      && !bDBBPFlag
     3944#endif
    39423945      )
    39433946    {
     
    39633966      && !bARPFlag
    39643967#endif
     3968#if RWTH_H0057_DBBP_NO_SPU
     3969      && !bDBBPFlag
     3970#endif
    39653971      )
    39663972    {
     
    39863992      && !bARPFlag
    39873993#endif
     3994#if RWTH_H0057_DBBP_NO_SPU
     3995      && !bDBBPFlag
     3996#endif
    39883997      )
    39893998    {
     
    40064015#if H_3D_ARP
    40074016      && !bARPFlag
     4017#endif
     4018#if RWTH_H0057_DBBP_NO_SPU
     4019      && !bDBBPFlag
    40084020#endif
    40094021      )
     
    40294041#if H_3D_ARP
    40304042      && !bARPFlag
     4043#endif
     4044#if RWTH_H0057_DBBP_NO_SPU
     4045      && !bDBBPFlag
    40314046#endif
    40324047      )
     
    46894704#if H_3D_ARP
    46904705      !bARPFlag &&
     4706#endif
     4707#if RWTH_H0057_DBBP_NO_SPU
     4708      !bDBBPFlag &&
    46914709#endif
    46924710      xAddVspCand( mrgCandIdx, &cDisInfo, iCount, abCandIsInter, pcMvFieldNeighbours, puhInterDirNeighbours, vspFlag, iCount3DV, inheritedVSPDisInfo ) )
Note: See TracChangeset for help on using the changeset viewer.