Changeset 34 in SHVCSoftware for branches/SHM-1.0-dev/source/App


Ignore:
Timestamp:
8 Feb 2013, 00:16:24 (12 years ago)
Author:
seregin
Message:

Merge with trunk

Location:
branches/SHM-1.0-dev/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-1.0-dev/source

  • branches/SHM-1.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r32 r34  
    9999
    100100#if REF_IDX_MFM
    101   if(layer == 0)
    102     m_acTEncTop[layer].setMFMEnabledFlag(false);
    103   else
    104     m_acTEncTop[layer].setMFMEnabledFlag(true);
     101    if(layer == 0)
     102    {
     103      m_acTEncTop[layer].setMFMEnabledFlag(false);
     104    }
     105    else
     106    {
     107      m_acTEncTop[layer].setMFMEnabledFlag(true);
     108    }
    105109#endif
    106110    // set layer ID
Note: See TracChangeset for help on using the changeset viewer.