Ignore:
Timestamp:
21 Oct 2013, 18:32:39 (11 years ago)
Author:
tech
Message:

Added missing parts of merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h

    r648 r653  
    173173#endif
    174174
    175 #endif // H_3D
    176 
    177175
    178176// Rate Control
    … …  
    180178#define KWU_RC_VIEWRC_E0227               0  ///< JCT3V-E0227, view-wise target bitrate allocation
    181179#define KWU_RC_MADPRED_E0227              0  ///< JCT3V-E0227, inter-view MAD prediction
     180
     181#endif // H_3D
     182
     183
    182184
    183185/////////////////////////////////////////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.