Ignore:
Timestamp:
15 Nov 2012, 21:36:12 (12 years ago)
Author:
tech
Message:

Removed old macro switches.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

    r187 r188  
    3838#include "TEncTop.h"
    3939#include "TEncSlice.h"
    40 #if HHI_VSO_SPEEDUP_A0033
    4140#include "../../App/TAppEncoder/TAppEncTop.h"
    42 #endif
    4341#include <math.h>
    4442
     
    659657  m_uiPicDist       = 0;
    660658 
    661 #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     659#if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG
    662660  Bool bReset =(pcSlice->getPOC() == 0) ||
    663661    (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     
    823821  UInt uiTileLCUX     = 0;
    824822
    825 #if HHI_VSO_SPEEDUP_A0033
    826823  Int iLastPosY = -1;
    827 #endif
    828824
    829825  // for every CU in slice
     
    838834    pcCU->initCU( rpcPic, uiCUAddr );
    839835
    840 #if HHI_VSO_SPEEDUP_A0033
    841836    if ( m_pcRdCost->getUseRenModel() )
    842837    {
     
    852847      }
    853848    }   
    854 #endif
    855849
    856850    // inherit from TR if necessary, select substream to use.
Note: See TracChangeset for help on using the changeset viewer.