Changeset 550 in SHVCSoftware for branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp
- Timestamp:
- 21 Jan 2014, 18:47:46 (11 years ago)
- Location:
- branches/SHM-5.0-dev/source
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-5.0-dev/source
- Property svn:mergeinfo changed
/branches/SHM-4.1-dev/source merged: 542-546 /trunk/source merged: 547 reverse-merged: 352
- Property svn:mergeinfo changed
-
branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp
r540 r550 1171 1171 vps->setNumOutputLayerSets(vps->getNumLayerSets()); 1172 1172 vps->setNumProfileTierLevel(vps->getNumLayerSets()); 1173 #if O0109_DEFAULT_ONE_OUT_LAYER_IDC 1174 vps->setDefaultOneTargetOutputLayerIdc(1); 1175 #else 1173 1176 vps->setDefaultOneTargetOutputLayerFlag(true); 1177 #endif 1174 1178 for(i = 1; i < vps->getNumLayerSets(); i++) 1175 1179 {
Note: See TracChangeset for help on using the changeset viewer.