Changeset 453 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
8 Nov 2013, 07:35:24 (11 years ago)
Author:
seregin
Message:

remove SH_DISCARDABLE_FLAG macro

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r452 r453  
    15291529  if(!rpcSlice->getDependentSliceSegmentFlag())
    15301530  {
     1531#if SVC_EXTENSION
    15311532#if POC_RESET_FLAG
    15321533    Int iBits = 0;
     
    15461547    }
    15471548#else
    1548 #if SH_DISCARDABLE_FLAG
    15491549    if(rpcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
    15501550    {
     
    15551555      READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored
    15561556    }
    1557 #else
     1557#endif
     1558#else //SVC_EXTENSION
    15581559    for (Int i = 0; i < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
    15591560    {
    15601561      READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored
    15611562    }
    1562 #endif
    1563 #endif
     1563#endif //SVC_EXTENSION
    15641564
    15651565    READ_UVLC (    uiCode, "slice_type" );            rpcSlice->setSliceType((SliceType)uiCode);
Note: See TracChangeset for help on using the changeset viewer.