Index: branches/HTM-14.1-update-dev4-RWTH/HTM.xcodeproj/project.pbxproj
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/HTM.xcodeproj/project.pbxproj	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/HTM.xcodeproj/project.pbxproj	(revision 1222)
@@ -25,84 +25,87 @@
 
 /* Begin PBXBuildFile section */
-		7874637E17D5DD900040CFC7 /* encmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C117D5DD7B0040CFC7 /* encmain.cpp */; };
-		7874637F17D5DD900040CFC7 /* TAppEncCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */; };
-		7874638017D5DD900040CFC7 /* TAppEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */; };
-		7874638117D5DDA60040CFC7 /* NALwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633F17D5DD840040CFC7 /* NALwrite.cpp */; };
-		7874638217D5DDA60040CFC7 /* SEIwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634117D5DD840040CFC7 /* SEIwrite.cpp */; };
-		7874638317D5DDA60040CFC7 /* SyntaxElementWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */; };
-		7874638417D5DDA60040CFC7 /* TEncAnalyze.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */; };
-		7874638517D5DDA60040CFC7 /* TEncBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */; };
-		7874638617D5DDA60040CFC7 /* TEncBinCoderCABACCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */; };
-		7874638717D5DDA60040CFC7 /* TEncCavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */; };
-		7874638817D5DDA60040CFC7 /* TEncCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634F17D5DD840040CFC7 /* TEncCu.cpp */; };
-		7874638917D5DDA60040CFC7 /* TEncEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635117D5DD840040CFC7 /* TEncEntropy.cpp */; };
-		7874638A17D5DDA60040CFC7 /* TEncGOP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635317D5DD840040CFC7 /* TEncGOP.cpp */; };
-		7874638B17D5DDA60040CFC7 /* TEncPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635517D5DD840040CFC7 /* TEncPic.cpp */; };
-		7874638C17D5DDA60040CFC7 /* TEncPreanalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */; };
-		7874638D17D5DDA60040CFC7 /* TEncRateCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */; };
-		7874638E17D5DDA60040CFC7 /* TEncSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */; };
-		7874638F17D5DDA60040CFC7 /* TEncSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635D17D5DD840040CFC7 /* TEncSbac.cpp */; };
-		7874639017D5DDA60040CFC7 /* TEncSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635F17D5DD840040CFC7 /* TEncSearch.cpp */; };
-		7874639117D5DDA60040CFC7 /* TEncSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636117D5DD840040CFC7 /* TEncSlice.cpp */; };
-		7874639217D5DDA60040CFC7 /* TEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636317D5DD840040CFC7 /* TEncTop.cpp */; };
-		7874639317D5DDA60040CFC7 /* WeightPredAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */; };
-		7874639417D5DE070040CFC7 /* TComPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630E17D5DD840040CFC7 /* TComPrediction.cpp */; };
-		7874639517D5DE070040CFC7 /* TComRdCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631017D5DD840040CFC7 /* TComRdCost.cpp */; };
-		7874639617D5DE070040CFC7 /* TComRdCostWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */; };
-		7874639717D5DE070040CFC7 /* TComRom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631417D5DD840040CFC7 /* TComRom.cpp */; };
-		7874639817D5DE070040CFC7 /* TComSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */; };
-		7874639917D5DE070040CFC7 /* TComSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631817D5DD840040CFC7 /* TComSlice.cpp */; };
-		7874639A17D5DE070040CFC7 /* TComTrQuant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */; };
-		7874639B17D5DE070040CFC7 /* TComWedgelet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */; };
-		7874639C17D5DE070040CFC7 /* TComWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */; };
-		7874639D17D5DE070040CFC7 /* TComYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632017D5DD840040CFC7 /* TComYuv.cpp */; };
-		7874639E17D5DE230040CFC7 /* TComMotionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */; };
-		7874639F17D5DE230040CFC7 /* TComPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630517D5DD840040CFC7 /* TComPattern.cpp */; };
-		787463A017D5DE230040CFC7 /* TComPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630717D5DD840040CFC7 /* TComPic.cpp */; };
-		787463A117D5DE230040CFC7 /* TComPicSym.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630917D5DD840040CFC7 /* TComPicSym.cpp */; };
-		787463A217D5DE230040CFC7 /* TComPicYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */; };
-		787463A317D5DE230040CFC7 /* TComPicYuvMD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */; };
-		787463A417D5DE400040CFC7 /* TComCABACTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F917D5DD840040CFC7 /* TComCABACTables.cpp */; };
-		787463A517D5DE400040CFC7 /* TComDataCU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462FB17D5DD840040CFC7 /* TComDataCU.cpp */; };
-		787463A617D5DE400040CFC7 /* TComInterpolationFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */; };
-		787463A717D5DE400040CFC7 /* TComLoopFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */; };
-		787463A817D5DE4B0040CFC7 /* TComBitStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F717D5DD840040CFC7 /* TComBitStream.cpp */; };
-		787463A917D5DE640040CFC7 /* ContextModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462EE17D5DD840040CFC7 /* ContextModel.cpp */; };
-		787463AA17D5DE640040CFC7 /* ContextModel3DBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */; };
-		787463AB17D5DE640040CFC7 /* SEI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F417D5DD840040CFC7 /* SEI.cpp */; };
-		787463AC17D5DE8A0040CFC7 /* TVideoIOYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */; };
-		787463AD17D5DE980040CFC7 /* TRenFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636B17D5DD840040CFC7 /* TRenFilter.cpp */; };
-		787463AE17D5DE980040CFC7 /* TRenImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636D17D5DD840040CFC7 /* TRenImage.cpp */; };
-		787463AF17D5DE980040CFC7 /* TRenImagePlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */; };
-		787463B017D5DE980040CFC7 /* TRenInterpFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */; };
-		787463B117D5DE9D0040CFC7 /* TRenModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637317D5DD840040CFC7 /* TRenModel.cpp */; };
-		787463B217D5DE9D0040CFC7 /* TRenModSetupStrParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */; };
-		787463B317D5DE9D0040CFC7 /* TRenSingleModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */; };
-		787463B417D5DE9D0040CFC7 /* TRenTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637917D5DD840040CFC7 /* TRenTop.cpp */; };
-		787463B517D5DEAF0040CFC7 /* program_options_lite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462E717D5DD840040CFC7 /* program_options_lite.cpp */; };
-		787463B617D5DEAF0040CFC7 /* TAppComCamPara.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */; };
-		787463B717D5DED40040CFC7 /* libmd5.c in Sources */ = {isa = PBXBuildFile; fileRef = 787462E317D5DD840040CFC7 /* libmd5.c */; };
-		787463B817D5DEE80040CFC7 /* AnnexBread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632417D5DD840040CFC7 /* AnnexBread.cpp */; };
-		787463B917D5DEE80040CFC7 /* NALread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632617D5DD840040CFC7 /* NALread.cpp */; };
-		787463BA17D5DEE80040CFC7 /* SEIread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632817D5DD840040CFC7 /* SEIread.cpp */; };
-		787463BB17D5DEE80040CFC7 /* SyntaxElementParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */; };
-		787463BC17D5DEE80040CFC7 /* TDecBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */; };
-		787463BD17D5DEE80040CFC7 /* TDecCAVLC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */; };
-		787463BE17D5DEE80040CFC7 /* TDecCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633117D5DD840040CFC7 /* TDecCu.cpp */; };
-		787463BF17D5DEE80040CFC7 /* TDecEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633317D5DD840040CFC7 /* TDecEntropy.cpp */; };
-		787463C017D5DEE80040CFC7 /* TDecGop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633517D5DD840040CFC7 /* TDecGop.cpp */; };
-		787463C117D5DEE80040CFC7 /* TDecSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633717D5DD840040CFC7 /* TDecSbac.cpp */; };
-		787463C217D5DEE80040CFC7 /* TDecSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633917D5DD840040CFC7 /* TDecSlice.cpp */; };
-		787463C317D5DEE80040CFC7 /* TDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633B17D5DD840040CFC7 /* TDecTop.cpp */; };
-		787463C417D5DEFB0040CFC7 /* decmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BB17D5DD7B0040CFC7 /* decmain.cpp */; };
-		787463C517D5DEFB0040CFC7 /* TAppDecCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */; };
-		787463C617D5DEFB0040CFC7 /* TAppDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */; };
-		787463C717D5DF080040CFC7 /* extrmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C717D5DD7B0040CFC7 /* extrmain.cpp */; };
-		787463C817D5DF080040CFC7 /* TAppExtrCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */; };
-		787463C917D5DF080040CFC7 /* TAppExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */; };
-		787463CA17D5DF0E0040CFC7 /* RendererMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */; };
-		787463CB17D5DF0E0040CFC7 /* TAppRendererCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */; };
-		787463CC17D5DF0E0040CFC7 /* TAppRendererTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */; };
-		787463CD17D5DF220040CFC7 /* TExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636817D5DD840040CFC7 /* TExtrTop.cpp */; };
+		784870741B0B62D10098FD5A /* decmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FA71B0B62C70098FD5A /* decmain.cpp */; };
+		784870751B0B62D10098FD5A /* TAppDecCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */; };
+		784870761B0B62D10098FD5A /* TAppDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */; };
+		784870771B0B62D80098FD5A /* encmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAD1B0B62C70098FD5A /* encmain.cpp */; };
+		784870781B0B62D80098FD5A /* TAppEncCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */; };
+		784870791B0B62D80098FD5A /* TAppEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */; };
+		7848707A1B0B62E10098FD5A /* extrmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB31B0B62C70098FD5A /* extrmain.cpp */; };
+		7848707B1B0B62E10098FD5A /* TAppExtrCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */; };
+		7848707C1B0B62E10098FD5A /* TAppExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */; };
+		7848707D1B0B62E80098FD5A /* RendererMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB91B0B62C70098FD5A /* RendererMain.cpp */; };
+		7848707E1B0B62E80098FD5A /* TAppRendererCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */; };
+		7848707F1B0B62E80098FD5A /* TAppRendererTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */; };
+		784870801B0B63040098FD5A /* program_options_lite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD41B0B62C70098FD5A /* program_options_lite.cpp */; };
+		784870811B0B63040098FD5A /* TAppComCamPara.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */; };
+		784870821B0B63230098FD5A /* ContextModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FDB1B0B62C70098FD5A /* ContextModel.cpp */; };
+		784870831B0B63230098FD5A /* ContextModel3DBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */; };
+		784870841B0B63230098FD5A /* Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE01B0B62C70098FD5A /* Debug.cpp */; };
+		784870851B0B63230098FD5A /* SEI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE31B0B62C70098FD5A /* SEI.cpp */; };
+		784870861B0B63230098FD5A /* TComBitStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE61B0B62C70098FD5A /* TComBitStream.cpp */; };
+		784870871B0B63230098FD5A /* TComCABACTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */; };
+		784870881B0B63230098FD5A /* TComChromaFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */; };
+		784870891B0B63230098FD5A /* TComDataCU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FED1B0B62C70098FD5A /* TComDataCU.cpp */; };
+		7848708A1B0B63230098FD5A /* TComInterpolationFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */; };
+		7848708B1B0B63230098FD5A /* TComLoopFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */; };
+		7848708C1B0B63230098FD5A /* TComMotionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */; };
+		7848708D1B0B63230098FD5A /* TComPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF71B0B62C70098FD5A /* TComPattern.cpp */; };
+		7848708E1B0B63230098FD5A /* TComPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF91B0B62C70098FD5A /* TComPic.cpp */; };
+		7848708F1B0B63230098FD5A /* TComPicSym.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */; };
+		784870901B0B63230098FD5A /* TComPicYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */; };
+		784870911B0B63230098FD5A /* TComPicYuvMD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */; };
+		784870921B0B63230098FD5A /* TComPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870001B0B62C70098FD5A /* TComPrediction.cpp */; };
+		784870931B0B63230098FD5A /* TComRdCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870021B0B62C70098FD5A /* TComRdCost.cpp */; };
+		784870941B0B63230098FD5A /* TComRdCostWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */; };
+		784870951B0B63230098FD5A /* TComRom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870071B0B62C70098FD5A /* TComRom.cpp */; };
+		784870961B0B63230098FD5A /* TComSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */; };
+		784870971B0B63230098FD5A /* TComSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700B1B0B62C70098FD5A /* TComSlice.cpp */; };
+		784870981B0B63230098FD5A /* TComTrQuant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */; };
+		784870991B0B63230098FD5A /* TComTU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700F1B0B62C70098FD5A /* TComTU.cpp */; };
+		7848709A1B0B63230098FD5A /* TComWedgelet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870111B0B62C70098FD5A /* TComWedgelet.cpp */; };
+		7848709B1B0B63230098FD5A /* TComWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */; };
+		7848709C1B0B63230098FD5A /* TComYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870151B0B62C70098FD5A /* TComYuv.cpp */; };
+		7848709D1B0B63360098FD5A /* AnnexBread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870191B0B62C70098FD5A /* AnnexBread.cpp */; };
+		7848709E1B0B63360098FD5A /* NALread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701B1B0B62C70098FD5A /* NALread.cpp */; };
+		7848709F1B0B63360098FD5A /* SEIread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701D1B0B62C70098FD5A /* SEIread.cpp */; };
+		784870A01B0B63360098FD5A /* SyntaxElementParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */; };
+		784870A11B0B63360098FD5A /* TDecBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */; };
+		784870A21B0B63360098FD5A /* TDecCAVLC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870241B0B62C70098FD5A /* TDecCAVLC.cpp */; };
+		784870A31B0B63360098FD5A /* TDecCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870261B0B62C70098FD5A /* TDecCu.cpp */; };
+		784870A41B0B63360098FD5A /* TDecEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870281B0B62C70098FD5A /* TDecEntropy.cpp */; };
+		784870A51B0B63360098FD5A /* TDecGop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702A1B0B62C70098FD5A /* TDecGop.cpp */; };
+		784870A61B0B63360098FD5A /* TDecSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702C1B0B62C70098FD5A /* TDecSbac.cpp */; };
+		784870A71B0B63360098FD5A /* TDecSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702E1B0B62C70098FD5A /* TDecSlice.cpp */; };
+		784870A81B0B63360098FD5A /* TDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870301B0B62C70098FD5A /* TDecTop.cpp */; };
+		784870A91B0B634A0098FD5A /* NALwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870341B0B62C70098FD5A /* NALwrite.cpp */; };
+		784870AA1B0B634A0098FD5A /* SEIEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870361B0B62C70098FD5A /* SEIEncoder.cpp */; };
+		784870AB1B0B634A0098FD5A /* SEIwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870381B0B62C70098FD5A /* SEIwrite.cpp */; };
+		784870AC1B0B634A0098FD5A /* SyntaxElementWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */; };
+		784870AD1B0B634A0098FD5A /* TEncBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */; };
+		784870AE1B0B634A0098FD5A /* TEncBinCoderCABACCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */; };
+		784870AF1B0B634A0098FD5A /* TEncCavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870421B0B62C70098FD5A /* TEncCavlc.cpp */; };
+		784870B01B0B634A0098FD5A /* TEncCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870451B0B62C70098FD5A /* TEncCu.cpp */; };
+		784870B11B0B634A0098FD5A /* TEncEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870471B0B62C70098FD5A /* TEncEntropy.cpp */; };
+		784870B21B0B634A0098FD5A /* TEncGOP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870491B0B62C70098FD5A /* TEncGOP.cpp */; };
+		784870B31B0B634A0098FD5A /* TEncPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704B1B0B62C70098FD5A /* TEncPic.cpp */; };
+		784870B41B0B634A0098FD5A /* TEncPreanalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */; };
+		784870B51B0B634A0098FD5A /* TEncRateCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */; };
+		784870B61B0B634A0098FD5A /* TEncSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */; };
+		784870B71B0B634A0098FD5A /* TEncSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870531B0B62C70098FD5A /* TEncSbac.cpp */; };
+		784870B81B0B634A0098FD5A /* TEncSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870551B0B62C70098FD5A /* TEncSearch.cpp */; };
+		784870B91B0B634A0098FD5A /* TEncSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870571B0B62C70098FD5A /* TEncSlice.cpp */; };
+		784870BA1B0B634A0098FD5A /* TEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870591B0B62C70098FD5A /* TEncTop.cpp */; };
+		784870BB1B0B634A0098FD5A /* WeightPredAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */; };
+		784870BC1B0B63520098FD5A /* TExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848705E1B0B62C70098FD5A /* TExtrTop.cpp */; };
+		784870BD1B0B635C0098FD5A /* TRenFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870611B0B62C70098FD5A /* TRenFilter.cpp */; };
+		784870BE1B0B635C0098FD5A /* TRenImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870631B0B62C70098FD5A /* TRenImage.cpp */; };
+		784870BF1B0B635C0098FD5A /* TRenImagePlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870651B0B62C70098FD5A /* TRenImagePlane.cpp */; };
+		784870C01B0B635C0098FD5A /* TRenInterpFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */; };
+		784870C11B0B635C0098FD5A /* TRenModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870691B0B62C70098FD5A /* TRenModel.cpp */; };
+		784870C21B0B635C0098FD5A /* TRenModSetupStrParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */; };
+		784870C31B0B635C0098FD5A /* TRenSingleModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */; };
+		784870C41B0B635C0098FD5A /* TRenTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706F1B0B62C70098FD5A /* TRenTop.cpp */; };
+		784870C51B0B63610098FD5A /* TVideoIOYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */; };
+		784870C61B0B63740098FD5A /* libmd5.c in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD01B0B62C70098FD5A /* libmd5.c */; };
 		78C5940D15872233004401C5 /* libTLibCommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767959411AD61BB00421804 /* libTLibCommon.a */; };
 		78C5940E15872233004401C5 /* libTLibEncoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767961911AD626F00421804 /* libTLibEncoder.a */; };
@@ -289,192 +292,195 @@
 		6767966A11AD635600421804 /* TAppEncoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppEncoder; sourceTree = BUILT_PRODUCTS_DIR; };
 		6782E0DE11AD691A00E8FFB8 /* TAppDecoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppDecoder; sourceTree = BUILT_PRODUCTS_DIR; };
-		785E596C17D9AFA8001F6DD1 /* TStatHeader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatHeader.cpp; sourceTree = "<group>"; };
-		785E596D17D9AFA8001F6DD1 /* TStatHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatHeader.h; sourceTree = "<group>"; };
-		785E596E17D9AFA8001F6DD1 /* TStatLayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatLayer.cpp; sourceTree = "<group>"; };
-		785E596F17D9AFA8001F6DD1 /* TStatLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatLayer.h; sourceTree = "<group>"; };
-		785E597017D9AFA8001F6DD1 /* TStatTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatTop.cpp; sourceTree = "<group>"; };
-		785E597117D9AFA8001F6DD1 /* TStatTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatTop.h; sourceTree = "<group>"; };
-		787462BB17D5DD7B0040CFC7 /* decmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = decmain.cpp; sourceTree = "<group>"; };
-		787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecCfg.cpp; sourceTree = "<group>"; };
-		787462BD17D5DD7B0040CFC7 /* TAppDecCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecCfg.h; sourceTree = "<group>"; };
-		787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecTop.cpp; sourceTree = "<group>"; };
-		787462BF17D5DD7B0040CFC7 /* TAppDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecTop.h; sourceTree = "<group>"; };
-		787462C117D5DD7B0040CFC7 /* encmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = encmain.cpp; sourceTree = "<group>"; };
-		787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncCfg.cpp; sourceTree = "<group>"; };
-		787462C317D5DD7B0040CFC7 /* TAppEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncCfg.h; sourceTree = "<group>"; };
-		787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncTop.cpp; sourceTree = "<group>"; };
-		787462C517D5DD7B0040CFC7 /* TAppEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncTop.h; sourceTree = "<group>"; };
-		787462C717D5DD7B0040CFC7 /* extrmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = extrmain.cpp; sourceTree = "<group>"; };
-		787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrCfg.cpp; sourceTree = "<group>"; };
-		787462C917D5DD7B0040CFC7 /* TAppExtrCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrCfg.h; sourceTree = "<group>"; };
-		787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrTop.cpp; sourceTree = "<group>"; };
-		787462CB17D5DD7B0040CFC7 /* TAppExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrTop.h; sourceTree = "<group>"; };
-		787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RendererMain.cpp; sourceTree = "<group>"; };
-		787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererCfg.cpp; sourceTree = "<group>"; };
-		787462CF17D5DD7B0040CFC7 /* TAppRendererCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererCfg.h; sourceTree = "<group>"; };
-		787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererTop.cpp; sourceTree = "<group>"; };
-		787462D117D5DD7B0040CFC7 /* TAppRendererTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererTop.h; sourceTree = "<group>"; };
-		787462D317D5DD7B0040CFC7 /* annexBbytecount.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = annexBbytecount.cpp; sourceTree = "<group>"; };
-		787462D517D5DD7B0040CFC7 /* encode.shl */ = {isa = PBXFileReference; lastKnownFileType = text; path = encode.shl; sourceTree = "<group>"; };
-		787462D617D5DD7B0040CFC7 /* encodeCommand.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = encodeCommand.sh; sourceTree = "<group>"; };
-		787462D717D5DD7B0040CFC7 /* ExtractBitrates.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitrates.cpp; sourceTree = "<group>"; };
-		787462D817D5DD7B0040CFC7 /* ExtractBitrates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtractBitrates.h; sourceTree = "<group>"; };
-		787462D917D5DD7B0040CFC7 /* ExtractBitratesMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitratesMain.cpp; sourceTree = "<group>"; };
-		787462DA17D5DD7B0040CFC7 /* GuessLambdaModifiers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiers.cpp; sourceTree = "<group>"; };
-		787462DB17D5DD7B0040CFC7 /* GuessLambdaModifiers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuessLambdaModifiers.h; sourceTree = "<group>"; };
-		787462DC17D5DD7B0040CFC7 /* GuessLambdaModifiersMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiersMain.cpp; sourceTree = "<group>"; };
-		787462DD17D5DD7B0040CFC7 /* makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = makefile; sourceTree = "<group>"; };
-		787462DE17D5DD7B0040CFC7 /* QuickStartGuide.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = QuickStartGuide.pdf; sourceTree = "<group>"; };
-		787462DF17D5DD7B0040CFC7 /* RuntimeError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeError.h; sourceTree = "<group>"; };
-		787462E017D5DD7B0040CFC7 /* targetBitrates.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = targetBitrates.sh; sourceTree = "<group>"; };
-		787462E117D5DD7B0040CFC7 /* convert_NtoMbit_YCbCr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = convert_NtoMbit_YCbCr.cpp; sourceTree = "<group>"; };
-		787462E317D5DD840040CFC7 /* libmd5.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = libmd5.c; sourceTree = "<group>"; };
-		787462E417D5DD840040CFC7 /* libmd5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libmd5.h; sourceTree = "<group>"; };
-		787462E517D5DD840040CFC7 /* MD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MD5.h; sourceTree = "<group>"; };
-		787462E717D5DD840040CFC7 /* program_options_lite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = program_options_lite.cpp; sourceTree = "<group>"; };
-		787462E817D5DD840040CFC7 /* program_options_lite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = program_options_lite.h; sourceTree = "<group>"; };
-		787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppComCamPara.cpp; sourceTree = "<group>"; };
-		787462EA17D5DD840040CFC7 /* TAppComCamPara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppComCamPara.h; sourceTree = "<group>"; };
-		787462EC17D5DD840040CFC7 /* AccessUnit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessUnit.h; sourceTree = "<group>"; };
-		787462ED17D5DD840040CFC7 /* CommonDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonDef.h; sourceTree = "<group>"; };
-		787462EE17D5DD840040CFC7 /* ContextModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel.cpp; sourceTree = "<group>"; };
-		787462EF17D5DD840040CFC7 /* ContextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel.h; sourceTree = "<group>"; };
-		787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel3DBuffer.cpp; sourceTree = "<group>"; };
-		787462F117D5DD840040CFC7 /* ContextModel3DBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel3DBuffer.h; sourceTree = "<group>"; };
-		787462F217D5DD840040CFC7 /* ContextTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextTables.h; sourceTree = "<group>"; };
-		787462F317D5DD840040CFC7 /* NAL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NAL.h; sourceTree = "<group>"; };
-		787462F417D5DD840040CFC7 /* SEI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEI.cpp; sourceTree = "<group>"; };
-		787462F517D5DD840040CFC7 /* SEI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEI.h; sourceTree = "<group>"; };
-		787462F617D5DD840040CFC7 /* TComBitCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitCounter.h; sourceTree = "<group>"; };
-		787462F717D5DD840040CFC7 /* TComBitStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComBitStream.cpp; sourceTree = "<group>"; };
-		787462F817D5DD840040CFC7 /* TComBitStream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitStream.h; sourceTree = "<group>"; };
-		787462F917D5DD840040CFC7 /* TComCABACTables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComCABACTables.cpp; sourceTree = "<group>"; };
-		787462FA17D5DD840040CFC7 /* TComCABACTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCABACTables.h; sourceTree = "<group>"; };
-		787462FB17D5DD840040CFC7 /* TComDataCU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComDataCU.cpp; sourceTree = "<group>"; };
-		787462FC17D5DD840040CFC7 /* TComDataCU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComDataCU.h; sourceTree = "<group>"; };
-		787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComInterpolationFilter.cpp; sourceTree = "<group>"; };
-		787462FE17D5DD840040CFC7 /* TComInterpolationFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComInterpolationFilter.h; sourceTree = "<group>"; };
-		787462FF17D5DD840040CFC7 /* TComList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComList.h; sourceTree = "<group>"; };
-		7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComLoopFilter.cpp; sourceTree = "<group>"; };
-		7874630117D5DD840040CFC7 /* TComLoopFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComLoopFilter.h; sourceTree = "<group>"; };
-		7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComMotionInfo.cpp; sourceTree = "<group>"; };
-		7874630317D5DD840040CFC7 /* TComMotionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMotionInfo.h; sourceTree = "<group>"; };
-		7874630417D5DD840040CFC7 /* TComMv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMv.h; sourceTree = "<group>"; };
-		7874630517D5DD840040CFC7 /* TComPattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPattern.cpp; sourceTree = "<group>"; };
-		7874630617D5DD840040CFC7 /* TComPattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPattern.h; sourceTree = "<group>"; };
-		7874630717D5DD840040CFC7 /* TComPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPic.cpp; sourceTree = "<group>"; };
-		7874630817D5DD840040CFC7 /* TComPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPic.h; sourceTree = "<group>"; };
-		7874630917D5DD840040CFC7 /* TComPicSym.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicSym.cpp; sourceTree = "<group>"; };
-		7874630A17D5DD840040CFC7 /* TComPicSym.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicSym.h; sourceTree = "<group>"; };
-		7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuv.cpp; sourceTree = "<group>"; };
-		7874630C17D5DD840040CFC7 /* TComPicYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicYuv.h; sourceTree = "<group>"; };
-		7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuvMD5.cpp; sourceTree = "<group>"; };
-		7874630E17D5DD840040CFC7 /* TComPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPrediction.cpp; sourceTree = "<group>"; };
-		7874630F17D5DD840040CFC7 /* TComPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPrediction.h; sourceTree = "<group>"; };
-		7874631017D5DD840040CFC7 /* TComRdCost.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCost.cpp; sourceTree = "<group>"; };
-		7874631117D5DD840040CFC7 /* TComRdCost.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCost.h; sourceTree = "<group>"; };
-		7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCostWeightPrediction.cpp; sourceTree = "<group>"; };
-		7874631317D5DD840040CFC7 /* TComRdCostWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCostWeightPrediction.h; sourceTree = "<group>"; };
-		7874631417D5DD840040CFC7 /* TComRom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRom.cpp; sourceTree = "<group>"; };
-		7874631517D5DD840040CFC7 /* TComRom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRom.h; sourceTree = "<group>"; };
-		7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
-		7874631717D5DD840040CFC7 /* TComSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSampleAdaptiveOffset.h; sourceTree = "<group>"; };
-		7874631817D5DD840040CFC7 /* TComSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSlice.cpp; sourceTree = "<group>"; };
-		7874631917D5DD840040CFC7 /* TComSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSlice.h; sourceTree = "<group>"; };
-		7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTrQuant.cpp; sourceTree = "<group>"; };
-		7874631B17D5DD840040CFC7 /* TComTrQuant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTrQuant.h; sourceTree = "<group>"; };
-		7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWedgelet.cpp; sourceTree = "<group>"; };
-		7874631D17D5DD840040CFC7 /* TComWedgelet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWedgelet.h; sourceTree = "<group>"; };
-		7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWeightPrediction.cpp; sourceTree = "<group>"; };
-		7874631F17D5DD840040CFC7 /* TComWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWeightPrediction.h; sourceTree = "<group>"; };
-		7874632017D5DD840040CFC7 /* TComYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComYuv.cpp; sourceTree = "<group>"; };
-		7874632117D5DD840040CFC7 /* TComYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComYuv.h; sourceTree = "<group>"; };
-		7874632217D5DD840040CFC7 /* TypeDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeDef.h; sourceTree = "<group>"; };
-		7874632417D5DD840040CFC7 /* AnnexBread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AnnexBread.cpp; sourceTree = "<group>"; };
-		7874632517D5DD840040CFC7 /* AnnexBread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBread.h; sourceTree = "<group>"; };
-		7874632617D5DD840040CFC7 /* NALread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALread.cpp; sourceTree = "<group>"; };
-		7874632717D5DD840040CFC7 /* NALread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALread.h; sourceTree = "<group>"; };
-		7874632817D5DD840040CFC7 /* SEIread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIread.cpp; sourceTree = "<group>"; };
-		7874632917D5DD840040CFC7 /* SEIread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIread.h; sourceTree = "<group>"; };
-		7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementParser.cpp; sourceTree = "<group>"; };
-		7874632B17D5DD840040CFC7 /* SyntaxElementParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementParser.h; sourceTree = "<group>"; };
-		7874632C17D5DD840040CFC7 /* TDecBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoder.h; sourceTree = "<group>"; };
-		7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecBinCoderCABAC.cpp; sourceTree = "<group>"; };
-		7874632E17D5DD840040CFC7 /* TDecBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoderCABAC.h; sourceTree = "<group>"; };
-		7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCAVLC.cpp; sourceTree = "<group>"; };
-		7874633017D5DD840040CFC7 /* TDecCAVLC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCAVLC.h; sourceTree = "<group>"; };
-		7874633117D5DD840040CFC7 /* TDecCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCu.cpp; sourceTree = "<group>"; };
-		7874633217D5DD840040CFC7 /* TDecCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCu.h; sourceTree = "<group>"; };
-		7874633317D5DD840040CFC7 /* TDecEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecEntropy.cpp; sourceTree = "<group>"; };
-		7874633417D5DD840040CFC7 /* TDecEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecEntropy.h; sourceTree = "<group>"; };
-		7874633517D5DD840040CFC7 /* TDecGop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecGop.cpp; sourceTree = "<group>"; };
-		7874633617D5DD840040CFC7 /* TDecGop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecGop.h; sourceTree = "<group>"; };
-		7874633717D5DD840040CFC7 /* TDecSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSbac.cpp; sourceTree = "<group>"; };
-		7874633817D5DD840040CFC7 /* TDecSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSbac.h; sourceTree = "<group>"; };
-		7874633917D5DD840040CFC7 /* TDecSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSlice.cpp; sourceTree = "<group>"; };
-		7874633A17D5DD840040CFC7 /* TDecSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSlice.h; sourceTree = "<group>"; };
-		7874633B17D5DD840040CFC7 /* TDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecTop.cpp; sourceTree = "<group>"; };
-		7874633C17D5DD840040CFC7 /* TDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecTop.h; sourceTree = "<group>"; };
-		7874633E17D5DD840040CFC7 /* AnnexBwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBwrite.h; sourceTree = "<group>"; };
-		7874633F17D5DD840040CFC7 /* NALwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALwrite.cpp; sourceTree = "<group>"; };
-		7874634017D5DD840040CFC7 /* NALwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALwrite.h; sourceTree = "<group>"; };
-		7874634117D5DD840040CFC7 /* SEIwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIwrite.cpp; sourceTree = "<group>"; };
-		7874634217D5DD840040CFC7 /* SEIwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIwrite.h; sourceTree = "<group>"; };
-		7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementWriter.cpp; sourceTree = "<group>"; };
-		7874634417D5DD840040CFC7 /* SyntaxElementWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementWriter.h; sourceTree = "<group>"; };
-		7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncAnalyze.cpp; sourceTree = "<group>"; };
-		7874634617D5DD840040CFC7 /* TEncAnalyze.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncAnalyze.h; sourceTree = "<group>"; };
-		7874634717D5DD840040CFC7 /* TEncBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoder.h; sourceTree = "<group>"; };
-		7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABAC.cpp; sourceTree = "<group>"; };
-		7874634917D5DD840040CFC7 /* TEncBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABAC.h; sourceTree = "<group>"; };
-		7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABACCounter.cpp; sourceTree = "<group>"; };
-		7874634B17D5DD840040CFC7 /* TEncBinCoderCABACCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABACCounter.h; sourceTree = "<group>"; };
-		7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCavlc.cpp; sourceTree = "<group>"; };
-		7874634D17D5DD840040CFC7 /* TEncCavlc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCavlc.h; sourceTree = "<group>"; };
-		7874634E17D5DD840040CFC7 /* TEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCfg.h; sourceTree = "<group>"; };
-		7874634F17D5DD840040CFC7 /* TEncCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCu.cpp; sourceTree = "<group>"; };
-		7874635017D5DD840040CFC7 /* TEncCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCu.h; sourceTree = "<group>"; };
-		7874635117D5DD840040CFC7 /* TEncEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncEntropy.cpp; sourceTree = "<group>"; };
-		7874635217D5DD840040CFC7 /* TEncEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncEntropy.h; sourceTree = "<group>"; };
-		7874635317D5DD840040CFC7 /* TEncGOP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncGOP.cpp; sourceTree = "<group>"; };
-		7874635417D5DD840040CFC7 /* TEncGOP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncGOP.h; sourceTree = "<group>"; };
-		7874635517D5DD840040CFC7 /* TEncPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPic.cpp; sourceTree = "<group>"; };
-		7874635617D5DD840040CFC7 /* TEncPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPic.h; sourceTree = "<group>"; };
-		7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPreanalyzer.cpp; sourceTree = "<group>"; };
-		7874635817D5DD840040CFC7 /* TEncPreanalyzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPreanalyzer.h; sourceTree = "<group>"; };
-		7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncRateCtrl.cpp; sourceTree = "<group>"; };
-		7874635A17D5DD840040CFC7 /* TEncRateCtrl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncRateCtrl.h; sourceTree = "<group>"; };
-		7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
-		7874635C17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSampleAdaptiveOffset.h; sourceTree = "<group>"; };
-		7874635D17D5DD840040CFC7 /* TEncSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSbac.cpp; sourceTree = "<group>"; };
-		7874635E17D5DD840040CFC7 /* TEncSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSbac.h; sourceTree = "<group>"; };
-		7874635F17D5DD840040CFC7 /* TEncSearch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSearch.cpp; sourceTree = "<group>"; };
-		7874636017D5DD840040CFC7 /* TEncSearch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSearch.h; sourceTree = "<group>"; };
-		7874636117D5DD840040CFC7 /* TEncSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSlice.cpp; sourceTree = "<group>"; };
-		7874636217D5DD840040CFC7 /* TEncSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSlice.h; sourceTree = "<group>"; };
-		7874636317D5DD840040CFC7 /* TEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncTop.cpp; sourceTree = "<group>"; };
-		7874636417D5DD840040CFC7 /* TEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncTop.h; sourceTree = "<group>"; };
-		7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WeightPredAnalysis.cpp; sourceTree = "<group>"; };
-		7874636617D5DD840040CFC7 /* WeightPredAnalysis.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeightPredAnalysis.h; sourceTree = "<group>"; };
-		7874636817D5DD840040CFC7 /* TExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TExtrTop.cpp; sourceTree = "<group>"; };
-		7874636917D5DD840040CFC7 /* TExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TExtrTop.h; sourceTree = "<group>"; };
-		7874636B17D5DD840040CFC7 /* TRenFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenFilter.cpp; sourceTree = "<group>"; };
-		7874636C17D5DD840040CFC7 /* TRenFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenFilter.h; sourceTree = "<group>"; };
-		7874636D17D5DD840040CFC7 /* TRenImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImage.cpp; sourceTree = "<group>"; };
-		7874636E17D5DD840040CFC7 /* TRenImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImage.h; sourceTree = "<group>"; };
-		7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImagePlane.cpp; sourceTree = "<group>"; };
-		7874637017D5DD840040CFC7 /* TRenImagePlane.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImagePlane.h; sourceTree = "<group>"; };
-		7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenInterpFilter.cpp; sourceTree = "<group>"; };
-		7874637217D5DD840040CFC7 /* TRenInterpFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenInterpFilter.h; sourceTree = "<group>"; };
-		7874637317D5DD840040CFC7 /* TRenModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModel.cpp; sourceTree = "<group>"; };
-		7874637417D5DD840040CFC7 /* TRenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModel.h; sourceTree = "<group>"; };
-		7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModSetupStrParser.cpp; sourceTree = "<group>"; };
-		7874637617D5DD840040CFC7 /* TRenModSetupStrParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModSetupStrParser.h; sourceTree = "<group>"; };
-		7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenSingleModel.cpp; sourceTree = "<group>"; };
-		7874637817D5DD840040CFC7 /* TRenSingleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenSingleModel.h; sourceTree = "<group>"; };
-		7874637917D5DD840040CFC7 /* TRenTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenTop.cpp; sourceTree = "<group>"; };
-		7874637A17D5DD840040CFC7 /* TRenTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenTop.h; sourceTree = "<group>"; };
-		7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TVideoIOYuv.cpp; sourceTree = "<group>"; };
-		7874637D17D5DD840040CFC7 /* TVideoIOYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVideoIOYuv.h; sourceTree = "<group>"; };
+		78486FA71B0B62C70098FD5A /* decmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = decmain.cpp; sourceTree = "<group>"; };
+		78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecCfg.cpp; sourceTree = "<group>"; };
+		78486FA91B0B62C70098FD5A /* TAppDecCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecCfg.h; sourceTree = "<group>"; };
+		78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecTop.cpp; sourceTree = "<group>"; };
+		78486FAB1B0B62C70098FD5A /* TAppDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecTop.h; sourceTree = "<group>"; };
+		78486FAD1B0B62C70098FD5A /* encmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = encmain.cpp; sourceTree = "<group>"; };
+		78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncCfg.cpp; sourceTree = "<group>"; };
+		78486FAF1B0B62C70098FD5A /* TAppEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncCfg.h; sourceTree = "<group>"; };
+		78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncTop.cpp; sourceTree = "<group>"; };
+		78486FB11B0B62C70098FD5A /* TAppEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncTop.h; sourceTree = "<group>"; };
+		78486FB31B0B62C70098FD5A /* extrmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = extrmain.cpp; sourceTree = "<group>"; };
+		78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrCfg.cpp; sourceTree = "<group>"; };
+		78486FB51B0B62C70098FD5A /* TAppExtrCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrCfg.h; sourceTree = "<group>"; };
+		78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrTop.cpp; sourceTree = "<group>"; };
+		78486FB71B0B62C70098FD5A /* TAppExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrTop.h; sourceTree = "<group>"; };
+		78486FB91B0B62C70098FD5A /* RendererMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RendererMain.cpp; sourceTree = "<group>"; };
+		78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererCfg.cpp; sourceTree = "<group>"; };
+		78486FBB1B0B62C70098FD5A /* TAppRendererCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererCfg.h; sourceTree = "<group>"; };
+		78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererTop.cpp; sourceTree = "<group>"; };
+		78486FBD1B0B62C70098FD5A /* TAppRendererTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererTop.h; sourceTree = "<group>"; };
+		78486FBF1B0B62C70098FD5A /* annexBbytecount.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = annexBbytecount.cpp; sourceTree = "<group>"; };
+		78486FC11B0B62C70098FD5A /* encode.shl */ = {isa = PBXFileReference; lastKnownFileType = text; path = encode.shl; sourceTree = "<group>"; };
+		78486FC21B0B62C70098FD5A /* encodeCommand.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = encodeCommand.sh; sourceTree = "<group>"; };
+		78486FC31B0B62C70098FD5A /* ExtractBitrates.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitrates.cpp; sourceTree = "<group>"; };
+		78486FC41B0B62C70098FD5A /* ExtractBitrates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtractBitrates.h; sourceTree = "<group>"; };
+		78486FC51B0B62C70098FD5A /* ExtractBitratesMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitratesMain.cpp; sourceTree = "<group>"; };
+		78486FC61B0B62C70098FD5A /* GuessLambdaModifiers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiers.cpp; sourceTree = "<group>"; };
+		78486FC71B0B62C70098FD5A /* GuessLambdaModifiers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuessLambdaModifiers.h; sourceTree = "<group>"; };
+		78486FC81B0B62C70098FD5A /* GuessLambdaModifiersMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiersMain.cpp; sourceTree = "<group>"; };
+		78486FC91B0B62C70098FD5A /* makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = makefile; sourceTree = "<group>"; };
+		78486FCA1B0B62C70098FD5A /* QuickStartGuide.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = QuickStartGuide.pdf; sourceTree = "<group>"; };
+		78486FCB1B0B62C70098FD5A /* RuntimeError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeError.h; sourceTree = "<group>"; };
+		78486FCC1B0B62C70098FD5A /* targetBitrates.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = targetBitrates.sh; sourceTree = "<group>"; };
+		78486FCD1B0B62C70098FD5A /* convert_NtoMbit_YCbCr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = convert_NtoMbit_YCbCr.cpp; sourceTree = "<group>"; };
+		78486FD01B0B62C70098FD5A /* libmd5.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = libmd5.c; sourceTree = "<group>"; };
+		78486FD11B0B62C70098FD5A /* libmd5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libmd5.h; sourceTree = "<group>"; };
+		78486FD21B0B62C70098FD5A /* MD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MD5.h; sourceTree = "<group>"; };
+		78486FD41B0B62C70098FD5A /* program_options_lite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = program_options_lite.cpp; sourceTree = "<group>"; };
+		78486FD51B0B62C70098FD5A /* program_options_lite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = program_options_lite.h; sourceTree = "<group>"; };
+		78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppComCamPara.cpp; sourceTree = "<group>"; };
+		78486FD71B0B62C70098FD5A /* TAppComCamPara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppComCamPara.h; sourceTree = "<group>"; };
+		78486FD91B0B62C70098FD5A /* AccessUnit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessUnit.h; sourceTree = "<group>"; };
+		78486FDA1B0B62C70098FD5A /* CommonDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonDef.h; sourceTree = "<group>"; };
+		78486FDB1B0B62C70098FD5A /* ContextModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel.cpp; sourceTree = "<group>"; };
+		78486FDC1B0B62C70098FD5A /* ContextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel.h; sourceTree = "<group>"; };
+		78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel3DBuffer.cpp; sourceTree = "<group>"; };
+		78486FDE1B0B62C70098FD5A /* ContextModel3DBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel3DBuffer.h; sourceTree = "<group>"; };
+		78486FDF1B0B62C70098FD5A /* ContextTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ContextTables.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		78486FE01B0B62C70098FD5A /* Debug.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Debug.cpp; sourceTree = "<group>"; };
+		78486FE11B0B62C70098FD5A /* Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Debug.h; sourceTree = "<group>"; };
+		78486FE21B0B62C70098FD5A /* NAL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NAL.h; sourceTree = "<group>"; };
+		78486FE31B0B62C70098FD5A /* SEI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEI.cpp; sourceTree = "<group>"; };
+		78486FE41B0B62C70098FD5A /* SEI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEI.h; sourceTree = "<group>"; };
+		78486FE51B0B62C70098FD5A /* TComBitCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitCounter.h; sourceTree = "<group>"; };
+		78486FE61B0B62C70098FD5A /* TComBitStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComBitStream.cpp; sourceTree = "<group>"; };
+		78486FE71B0B62C70098FD5A /* TComBitStream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitStream.h; sourceTree = "<group>"; };
+		78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComCABACTables.cpp; sourceTree = "<group>"; };
+		78486FE91B0B62C70098FD5A /* TComCABACTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCABACTables.h; sourceTree = "<group>"; };
+		78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComChromaFormat.cpp; sourceTree = "<group>"; };
+		78486FEB1B0B62C70098FD5A /* TComChromaFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComChromaFormat.h; sourceTree = "<group>"; };
+		78486FEC1B0B62C70098FD5A /* TComCodingStatistics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCodingStatistics.h; sourceTree = "<group>"; };
+		78486FED1B0B62C70098FD5A /* TComDataCU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComDataCU.cpp; sourceTree = "<group>"; };
+		78486FEE1B0B62C70098FD5A /* TComDataCU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComDataCU.h; sourceTree = "<group>"; };
+		78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComInterpolationFilter.cpp; sourceTree = "<group>"; };
+		78486FF01B0B62C70098FD5A /* TComInterpolationFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComInterpolationFilter.h; sourceTree = "<group>"; };
+		78486FF11B0B62C70098FD5A /* TComList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComList.h; sourceTree = "<group>"; };
+		78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComLoopFilter.cpp; sourceTree = "<group>"; };
+		78486FF31B0B62C70098FD5A /* TComLoopFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComLoopFilter.h; sourceTree = "<group>"; };
+		78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComMotionInfo.cpp; sourceTree = "<group>"; };
+		78486FF51B0B62C70098FD5A /* TComMotionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMotionInfo.h; sourceTree = "<group>"; };
+		78486FF61B0B62C70098FD5A /* TComMv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMv.h; sourceTree = "<group>"; };
+		78486FF71B0B62C70098FD5A /* TComPattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPattern.cpp; sourceTree = "<group>"; };
+		78486FF81B0B62C70098FD5A /* TComPattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPattern.h; sourceTree = "<group>"; };
+		78486FF91B0B62C70098FD5A /* TComPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPic.cpp; sourceTree = "<group>"; };
+		78486FFA1B0B62C70098FD5A /* TComPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPic.h; sourceTree = "<group>"; };
+		78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicSym.cpp; sourceTree = "<group>"; };
+		78486FFC1B0B62C70098FD5A /* TComPicSym.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicSym.h; sourceTree = "<group>"; };
+		78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuv.cpp; sourceTree = "<group>"; };
+		78486FFE1B0B62C70098FD5A /* TComPicYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicYuv.h; sourceTree = "<group>"; };
+		78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuvMD5.cpp; sourceTree = "<group>"; };
+		784870001B0B62C70098FD5A /* TComPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TComPrediction.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		784870011B0B62C70098FD5A /* TComPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TComPrediction.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		784870021B0B62C70098FD5A /* TComRdCost.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCost.cpp; sourceTree = "<group>"; };
+		784870031B0B62C70098FD5A /* TComRdCost.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCost.h; sourceTree = "<group>"; };
+		784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCostWeightPrediction.cpp; sourceTree = "<group>"; };
+		784870051B0B62C70098FD5A /* TComRdCostWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCostWeightPrediction.h; sourceTree = "<group>"; };
+		784870061B0B62C70098FD5A /* TComRectangle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRectangle.h; sourceTree = "<group>"; };
+		784870071B0B62C70098FD5A /* TComRom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRom.cpp; sourceTree = "<group>"; };
+		784870081B0B62C70098FD5A /* TComRom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRom.h; sourceTree = "<group>"; };
+		784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
+		7848700A1B0B62C70098FD5A /* TComSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSampleAdaptiveOffset.h; sourceTree = "<group>"; };
+		7848700B1B0B62C70098FD5A /* TComSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSlice.cpp; sourceTree = "<group>"; };
+		7848700C1B0B62C70098FD5A /* TComSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSlice.h; sourceTree = "<group>"; };
+		7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTrQuant.cpp; sourceTree = "<group>"; };
+		7848700E1B0B62C70098FD5A /* TComTrQuant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTrQuant.h; sourceTree = "<group>"; };
+		7848700F1B0B62C70098FD5A /* TComTU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTU.cpp; sourceTree = "<group>"; };
+		784870101B0B62C70098FD5A /* TComTU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTU.h; sourceTree = "<group>"; };
+		784870111B0B62C70098FD5A /* TComWedgelet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWedgelet.cpp; sourceTree = "<group>"; };
+		784870121B0B62C70098FD5A /* TComWedgelet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWedgelet.h; sourceTree = "<group>"; };
+		784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWeightPrediction.cpp; sourceTree = "<group>"; };
+		784870141B0B62C70098FD5A /* TComWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWeightPrediction.h; sourceTree = "<group>"; };
+		784870151B0B62C70098FD5A /* TComYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComYuv.cpp; sourceTree = "<group>"; };
+		784870161B0B62C70098FD5A /* TComYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComYuv.h; sourceTree = "<group>"; };
+		784870171B0B62C70098FD5A /* TypeDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TypeDef.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		784870191B0B62C70098FD5A /* AnnexBread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AnnexBread.cpp; sourceTree = "<group>"; };
+		7848701A1B0B62C70098FD5A /* AnnexBread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBread.h; sourceTree = "<group>"; };
+		7848701B1B0B62C70098FD5A /* NALread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALread.cpp; sourceTree = "<group>"; };
+		7848701C1B0B62C70098FD5A /* NALread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALread.h; sourceTree = "<group>"; };
+		7848701D1B0B62C70098FD5A /* SEIread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIread.cpp; sourceTree = "<group>"; };
+		7848701E1B0B62C70098FD5A /* SEIread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIread.h; sourceTree = "<group>"; };
+		7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementParser.cpp; sourceTree = "<group>"; };
+		784870201B0B62C70098FD5A /* SyntaxElementParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementParser.h; sourceTree = "<group>"; };
+		784870211B0B62C70098FD5A /* TDecBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoder.h; sourceTree = "<group>"; };
+		784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecBinCoderCABAC.cpp; sourceTree = "<group>"; };
+		784870231B0B62C70098FD5A /* TDecBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoderCABAC.h; sourceTree = "<group>"; };
+		784870241B0B62C70098FD5A /* TDecCAVLC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCAVLC.cpp; sourceTree = "<group>"; };
+		784870251B0B62C70098FD5A /* TDecCAVLC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCAVLC.h; sourceTree = "<group>"; };
+		784870261B0B62C70098FD5A /* TDecCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCu.cpp; sourceTree = "<group>"; };
+		784870271B0B62C70098FD5A /* TDecCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCu.h; sourceTree = "<group>"; };
+		784870281B0B62C70098FD5A /* TDecEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecEntropy.cpp; sourceTree = "<group>"; };
+		784870291B0B62C70098FD5A /* TDecEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecEntropy.h; sourceTree = "<group>"; };
+		7848702A1B0B62C70098FD5A /* TDecGop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecGop.cpp; sourceTree = "<group>"; };
+		7848702B1B0B62C70098FD5A /* TDecGop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecGop.h; sourceTree = "<group>"; };
+		7848702C1B0B62C70098FD5A /* TDecSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TDecSbac.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		7848702D1B0B62C70098FD5A /* TDecSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TDecSbac.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		7848702E1B0B62C70098FD5A /* TDecSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSlice.cpp; sourceTree = "<group>"; };
+		7848702F1B0B62C70098FD5A /* TDecSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSlice.h; sourceTree = "<group>"; };
+		784870301B0B62C70098FD5A /* TDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecTop.cpp; sourceTree = "<group>"; };
+		784870311B0B62C70098FD5A /* TDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecTop.h; sourceTree = "<group>"; };
+		784870331B0B62C70098FD5A /* AnnexBwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBwrite.h; sourceTree = "<group>"; };
+		784870341B0B62C70098FD5A /* NALwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALwrite.cpp; sourceTree = "<group>"; };
+		784870351B0B62C70098FD5A /* NALwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALwrite.h; sourceTree = "<group>"; };
+		784870361B0B62C70098FD5A /* SEIEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIEncoder.cpp; sourceTree = "<group>"; };
+		784870371B0B62C70098FD5A /* SEIEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIEncoder.h; sourceTree = "<group>"; };
+		784870381B0B62C70098FD5A /* SEIwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIwrite.cpp; sourceTree = "<group>"; };
+		784870391B0B62C70098FD5A /* SEIwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIwrite.h; sourceTree = "<group>"; };
+		7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementWriter.cpp; sourceTree = "<group>"; };
+		7848703B1B0B62C70098FD5A /* SyntaxElementWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementWriter.h; sourceTree = "<group>"; };
+		7848703C1B0B62C70098FD5A /* TEncAnalyze.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncAnalyze.h; sourceTree = "<group>"; };
+		7848703D1B0B62C70098FD5A /* TEncBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoder.h; sourceTree = "<group>"; };
+		7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABAC.cpp; sourceTree = "<group>"; };
+		7848703F1B0B62C70098FD5A /* TEncBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABAC.h; sourceTree = "<group>"; };
+		784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABACCounter.cpp; sourceTree = "<group>"; };
+		784870411B0B62C70098FD5A /* TEncBinCoderCABACCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABACCounter.h; sourceTree = "<group>"; };
+		784870421B0B62C70098FD5A /* TEncCavlc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCavlc.cpp; sourceTree = "<group>"; };
+		784870431B0B62C70098FD5A /* TEncCavlc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCavlc.h; sourceTree = "<group>"; };
+		784870441B0B62C70098FD5A /* TEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCfg.h; sourceTree = "<group>"; };
+		784870451B0B62C70098FD5A /* TEncCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCu.cpp; sourceTree = "<group>"; };
+		784870461B0B62C70098FD5A /* TEncCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCu.h; sourceTree = "<group>"; };
+		784870471B0B62C70098FD5A /* TEncEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncEntropy.cpp; sourceTree = "<group>"; };
+		784870481B0B62C70098FD5A /* TEncEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncEntropy.h; sourceTree = "<group>"; };
+		784870491B0B62C70098FD5A /* TEncGOP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncGOP.cpp; sourceTree = "<group>"; };
+		7848704A1B0B62C70098FD5A /* TEncGOP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncGOP.h; sourceTree = "<group>"; };
+		7848704B1B0B62C70098FD5A /* TEncPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPic.cpp; sourceTree = "<group>"; };
+		7848704C1B0B62C70098FD5A /* TEncPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPic.h; sourceTree = "<group>"; };
+		7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPreanalyzer.cpp; sourceTree = "<group>"; };
+		7848704E1B0B62C70098FD5A /* TEncPreanalyzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPreanalyzer.h; sourceTree = "<group>"; };
+		7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncRateCtrl.cpp; sourceTree = "<group>"; };
+		784870501B0B62C70098FD5A /* TEncRateCtrl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncRateCtrl.h; sourceTree = "<group>"; };
+		784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
+		784870521B0B62C70098FD5A /* TEncSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSampleAdaptiveOffset.h; sourceTree = "<group>"; };
+		784870531B0B62C70098FD5A /* TEncSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TEncSbac.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		784870541B0B62C70098FD5A /* TEncSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TEncSbac.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		784870551B0B62C70098FD5A /* TEncSearch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TEncSearch.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		784870561B0B62C70098FD5A /* TEncSearch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TEncSearch.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		784870571B0B62C70098FD5A /* TEncSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSlice.cpp; sourceTree = "<group>"; };
+		784870581B0B62C70098FD5A /* TEncSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSlice.h; sourceTree = "<group>"; };
+		784870591B0B62C70098FD5A /* TEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncTop.cpp; sourceTree = "<group>"; };
+		7848705A1B0B62C70098FD5A /* TEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncTop.h; sourceTree = "<group>"; };
+		7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WeightPredAnalysis.cpp; sourceTree = "<group>"; };
+		7848705C1B0B62C70098FD5A /* WeightPredAnalysis.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeightPredAnalysis.h; sourceTree = "<group>"; };
+		7848705E1B0B62C70098FD5A /* TExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TExtrTop.cpp; sourceTree = "<group>"; };
+		7848705F1B0B62C70098FD5A /* TExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TExtrTop.h; sourceTree = "<group>"; };
+		784870611B0B62C70098FD5A /* TRenFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenFilter.cpp; sourceTree = "<group>"; };
+		784870621B0B62C70098FD5A /* TRenFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenFilter.h; sourceTree = "<group>"; };
+		784870631B0B62C70098FD5A /* TRenImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImage.cpp; sourceTree = "<group>"; };
+		784870641B0B62C70098FD5A /* TRenImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImage.h; sourceTree = "<group>"; };
+		784870651B0B62C70098FD5A /* TRenImagePlane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImagePlane.cpp; sourceTree = "<group>"; };
+		784870661B0B62C70098FD5A /* TRenImagePlane.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImagePlane.h; sourceTree = "<group>"; };
+		784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenInterpFilter.cpp; sourceTree = "<group>"; };
+		784870681B0B62C70098FD5A /* TRenInterpFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenInterpFilter.h; sourceTree = "<group>"; };
+		784870691B0B62C70098FD5A /* TRenModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModel.cpp; sourceTree = "<group>"; };
+		7848706A1B0B62C70098FD5A /* TRenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModel.h; sourceTree = "<group>"; };
+		7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModSetupStrParser.cpp; sourceTree = "<group>"; };
+		7848706C1B0B62C70098FD5A /* TRenModSetupStrParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModSetupStrParser.h; sourceTree = "<group>"; };
+		7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenSingleModel.cpp; sourceTree = "<group>"; };
+		7848706E1B0B62C70098FD5A /* TRenSingleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenSingleModel.h; sourceTree = "<group>"; };
+		7848706F1B0B62C70098FD5A /* TRenTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenTop.cpp; sourceTree = "<group>"; };
+		784870701B0B62C70098FD5A /* TRenTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenTop.h; sourceTree = "<group>"; };
+		784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TVideoIOYuv.cpp; sourceTree = "<group>"; };
+		784870731B0B62C70098FD5A /* TVideoIOYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVideoIOYuv.h; sourceTree = "<group>"; };
 		7885897D15664E3D00982C12 /* libTLibExtractor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTLibExtractor.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7885899415664E6A00982C12 /* TAppExtractor */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppExtractor; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -595,6 +601,6 @@
 			isa = PBXGroup;
 			children = (
-				78C592E7158720BB004401C5 /* App */,
-				78C59310158720BB004401C5 /* Lib */,
+				78486FA51B0B62C70098FD5A /* App */,
+				78486FCE1B0B62C70098FD5A /* Lib */,
 			);
 			indentWidth = 2;
@@ -621,306 +627,12 @@
 			sourceTree = "<group>";
 		};
-		785E596B17D9AFA8001F6DD1 /* TLibStatistics */ = {
+		78486FA51B0B62C70098FD5A /* App */ = {
 			isa = PBXGroup;
 			children = (
-				785E596C17D9AFA8001F6DD1 /* TStatHeader.cpp */,
-				785E596D17D9AFA8001F6DD1 /* TStatHeader.h */,
-				785E596E17D9AFA8001F6DD1 /* TStatLayer.cpp */,
-				785E596F17D9AFA8001F6DD1 /* TStatLayer.h */,
-				785E597017D9AFA8001F6DD1 /* TStatTop.cpp */,
-				785E597117D9AFA8001F6DD1 /* TStatTop.h */,
-			);
-			path = TLibStatistics;
-			sourceTree = "<group>";
-		};
-		787462BA17D5DD7B0040CFC7 /* TAppDecoder */ = {
-			isa = PBXGroup;
-			children = (
-				787462BB17D5DD7B0040CFC7 /* decmain.cpp */,
-				787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */,
-				787462BD17D5DD7B0040CFC7 /* TAppDecCfg.h */,
-				787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */,
-				787462BF17D5DD7B0040CFC7 /* TAppDecTop.h */,
-			);
-			path = TAppDecoder;
-			sourceTree = "<group>";
-		};
-		787462C017D5DD7B0040CFC7 /* TAppEncoder */ = {
-			isa = PBXGroup;
-			children = (
-				787462C117D5DD7B0040CFC7 /* encmain.cpp */,
-				787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */,
-				787462C317D5DD7B0040CFC7 /* TAppEncCfg.h */,
-				787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */,
-				787462C517D5DD7B0040CFC7 /* TAppEncTop.h */,
-			);
-			path = TAppEncoder;
-			sourceTree = "<group>";
-		};
-		787462C617D5DD7B0040CFC7 /* TAppExtractor */ = {
-			isa = PBXGroup;
-			children = (
-				787462C717D5DD7B0040CFC7 /* extrmain.cpp */,
-				787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */,
-				787462C917D5DD7B0040CFC7 /* TAppExtrCfg.h */,
-				787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */,
-				787462CB17D5DD7B0040CFC7 /* TAppExtrTop.h */,
-			);
-			path = TAppExtractor;
-			sourceTree = "<group>";
-		};
-		787462CC17D5DD7B0040CFC7 /* TAppRenderer */ = {
-			isa = PBXGroup;
-			children = (
-				787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */,
-				787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */,
-				787462CF17D5DD7B0040CFC7 /* TAppRendererCfg.h */,
-				787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */,
-				787462D117D5DD7B0040CFC7 /* TAppRendererTop.h */,
-			);
-			path = TAppRenderer;
-			sourceTree = "<group>";
-		};
-		787462D217D5DD7B0040CFC7 /* utils */ = {
-			isa = PBXGroup;
-			children = (
-				787462D317D5DD7B0040CFC7 /* annexBbytecount.cpp */,
-				787462D417D5DD7B0040CFC7 /* BitrateTargeting */,
-				787462E117D5DD7B0040CFC7 /* convert_NtoMbit_YCbCr.cpp */,
-			);
-			path = utils;
-			sourceTree = "<group>";
-		};
-		787462D417D5DD7B0040CFC7 /* BitrateTargeting */ = {
-			isa = PBXGroup;
-			children = (
-				787462D517D5DD7B0040CFC7 /* encode.shl */,
-				787462D617D5DD7B0040CFC7 /* encodeCommand.sh */,
-				787462D717D5DD7B0040CFC7 /* ExtractBitrates.cpp */,
-				787462D817D5DD7B0040CFC7 /* ExtractBitrates.h */,
-				787462D917D5DD7B0040CFC7 /* ExtractBitratesMain.cpp */,
-				787462DA17D5DD7B0040CFC7 /* GuessLambdaModifiers.cpp */,
-				787462DB17D5DD7B0040CFC7 /* GuessLambdaModifiers.h */,
-				787462DC17D5DD7B0040CFC7 /* GuessLambdaModifiersMain.cpp */,
-				787462DD17D5DD7B0040CFC7 /* makefile */,
-				787462DE17D5DD7B0040CFC7 /* QuickStartGuide.pdf */,
-				787462DF17D5DD7B0040CFC7 /* RuntimeError.h */,
-				787462E017D5DD7B0040CFC7 /* targetBitrates.sh */,
-			);
-			path = BitrateTargeting;
-			sourceTree = "<group>";
-		};
-		787462E217D5DD840040CFC7 /* libmd5 */ = {
-			isa = PBXGroup;
-			children = (
-				787462E317D5DD840040CFC7 /* libmd5.c */,
-				787462E417D5DD840040CFC7 /* libmd5.h */,
-				787462E517D5DD840040CFC7 /* MD5.h */,
-			);
-			path = libmd5;
-			sourceTree = "<group>";
-		};
-		787462E617D5DD840040CFC7 /* TAppCommon */ = {
-			isa = PBXGroup;
-			children = (
-				787462E717D5DD840040CFC7 /* program_options_lite.cpp */,
-				787462E817D5DD840040CFC7 /* program_options_lite.h */,
-				787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */,
-				787462EA17D5DD840040CFC7 /* TAppComCamPara.h */,
-			);
-			path = TAppCommon;
-			sourceTree = "<group>";
-		};
-		787462EB17D5DD840040CFC7 /* TLibCommon */ = {
-			isa = PBXGroup;
-			children = (
-				787462EC17D5DD840040CFC7 /* AccessUnit.h */,
-				787462ED17D5DD840040CFC7 /* CommonDef.h */,
-				787462EE17D5DD840040CFC7 /* ContextModel.cpp */,
-				787462EF17D5DD840040CFC7 /* ContextModel.h */,
-				787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */,
-				787462F117D5DD840040CFC7 /* ContextModel3DBuffer.h */,
-				787462F217D5DD840040CFC7 /* ContextTables.h */,
-				787462F317D5DD840040CFC7 /* NAL.h */,
-				787462F417D5DD840040CFC7 /* SEI.cpp */,
-				787462F517D5DD840040CFC7 /* SEI.h */,
-				787462F617D5DD840040CFC7 /* TComBitCounter.h */,
-				787462F717D5DD840040CFC7 /* TComBitStream.cpp */,
-				787462F817D5DD840040CFC7 /* TComBitStream.h */,
-				787462F917D5DD840040CFC7 /* TComCABACTables.cpp */,
-				787462FA17D5DD840040CFC7 /* TComCABACTables.h */,
-				787462FB17D5DD840040CFC7 /* TComDataCU.cpp */,
-				787462FC17D5DD840040CFC7 /* TComDataCU.h */,
-				787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */,
-				787462FE17D5DD840040CFC7 /* TComInterpolationFilter.h */,
-				787462FF17D5DD840040CFC7 /* TComList.h */,
-				7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */,
-				7874630117D5DD840040CFC7 /* TComLoopFilter.h */,
-				7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */,
-				7874630317D5DD840040CFC7 /* TComMotionInfo.h */,
-				7874630417D5DD840040CFC7 /* TComMv.h */,
-				7874630517D5DD840040CFC7 /* TComPattern.cpp */,
-				7874630617D5DD840040CFC7 /* TComPattern.h */,
-				7874630717D5DD840040CFC7 /* TComPic.cpp */,
-				7874630817D5DD840040CFC7 /* TComPic.h */,
-				7874630917D5DD840040CFC7 /* TComPicSym.cpp */,
-				7874630A17D5DD840040CFC7 /* TComPicSym.h */,
-				7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */,
-				7874630C17D5DD840040CFC7 /* TComPicYuv.h */,
-				7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */,
-				7874630E17D5DD840040CFC7 /* TComPrediction.cpp */,
-				7874630F17D5DD840040CFC7 /* TComPrediction.h */,
-				7874631017D5DD840040CFC7 /* TComRdCost.cpp */,
-				7874631117D5DD840040CFC7 /* TComRdCost.h */,
-				7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */,
-				7874631317D5DD840040CFC7 /* TComRdCostWeightPrediction.h */,
-				7874631417D5DD840040CFC7 /* TComRom.cpp */,
-				7874631517D5DD840040CFC7 /* TComRom.h */,
-				7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */,
-				7874631717D5DD840040CFC7 /* TComSampleAdaptiveOffset.h */,
-				7874631817D5DD840040CFC7 /* TComSlice.cpp */,
-				7874631917D5DD840040CFC7 /* TComSlice.h */,
-				7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */,
-				7874631B17D5DD840040CFC7 /* TComTrQuant.h */,
-				7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */,
-				7874631D17D5DD840040CFC7 /* TComWedgelet.h */,
-				7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */,
-				7874631F17D5DD840040CFC7 /* TComWeightPrediction.h */,
-				7874632017D5DD840040CFC7 /* TComYuv.cpp */,
-				7874632117D5DD840040CFC7 /* TComYuv.h */,
-				7874632217D5DD840040CFC7 /* TypeDef.h */,
-			);
-			path = TLibCommon;
-			sourceTree = "<group>";
-		};
-		7874632317D5DD840040CFC7 /* TLibDecoder */ = {
-			isa = PBXGroup;
-			children = (
-				7874632417D5DD840040CFC7 /* AnnexBread.cpp */,
-				7874632517D5DD840040CFC7 /* AnnexBread.h */,
-				7874632617D5DD840040CFC7 /* NALread.cpp */,
-				7874632717D5DD840040CFC7 /* NALread.h */,
-				7874632817D5DD840040CFC7 /* SEIread.cpp */,
-				7874632917D5DD840040CFC7 /* SEIread.h */,
-				7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */,
-				7874632B17D5DD840040CFC7 /* SyntaxElementParser.h */,
-				7874632C17D5DD840040CFC7 /* TDecBinCoder.h */,
-				7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */,
-				7874632E17D5DD840040CFC7 /* TDecBinCoderCABAC.h */,
-				7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */,
-				7874633017D5DD840040CFC7 /* TDecCAVLC.h */,
-				7874633117D5DD840040CFC7 /* TDecCu.cpp */,
-				7874633217D5DD840040CFC7 /* TDecCu.h */,
-				7874633317D5DD840040CFC7 /* TDecEntropy.cpp */,
-				7874633417D5DD840040CFC7 /* TDecEntropy.h */,
-				7874633517D5DD840040CFC7 /* TDecGop.cpp */,
-				7874633617D5DD840040CFC7 /* TDecGop.h */,
-				7874633717D5DD840040CFC7 /* TDecSbac.cpp */,
-				7874633817D5DD840040CFC7 /* TDecSbac.h */,
-				7874633917D5DD840040CFC7 /* TDecSlice.cpp */,
-				7874633A17D5DD840040CFC7 /* TDecSlice.h */,
-				7874633B17D5DD840040CFC7 /* TDecTop.cpp */,
-				7874633C17D5DD840040CFC7 /* TDecTop.h */,
-			);
-			path = TLibDecoder;
-			sourceTree = "<group>";
-		};
-		7874633D17D5DD840040CFC7 /* TLibEncoder */ = {
-			isa = PBXGroup;
-			children = (
-				7874633E17D5DD840040CFC7 /* AnnexBwrite.h */,
-				7874633F17D5DD840040CFC7 /* NALwrite.cpp */,
-				7874634017D5DD840040CFC7 /* NALwrite.h */,
-				7874634117D5DD840040CFC7 /* SEIwrite.cpp */,
-				7874634217D5DD840040CFC7 /* SEIwrite.h */,
-				7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */,
-				7874634417D5DD840040CFC7 /* SyntaxElementWriter.h */,
-				7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */,
-				7874634617D5DD840040CFC7 /* TEncAnalyze.h */,
-				7874634717D5DD840040CFC7 /* TEncBinCoder.h */,
-				7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */,
-				7874634917D5DD840040CFC7 /* TEncBinCoderCABAC.h */,
-				7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */,
-				7874634B17D5DD840040CFC7 /* TEncBinCoderCABACCounter.h */,
-				7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */,
-				7874634D17D5DD840040CFC7 /* TEncCavlc.h */,
-				7874634E17D5DD840040CFC7 /* TEncCfg.h */,
-				7874634F17D5DD840040CFC7 /* TEncCu.cpp */,
-				7874635017D5DD840040CFC7 /* TEncCu.h */,
-				7874635117D5DD840040CFC7 /* TEncEntropy.cpp */,
-				7874635217D5DD840040CFC7 /* TEncEntropy.h */,
-				7874635317D5DD840040CFC7 /* TEncGOP.cpp */,
-				7874635417D5DD840040CFC7 /* TEncGOP.h */,
-				7874635517D5DD840040CFC7 /* TEncPic.cpp */,
-				7874635617D5DD840040CFC7 /* TEncPic.h */,
-				7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */,
-				7874635817D5DD840040CFC7 /* TEncPreanalyzer.h */,
-				7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */,
-				7874635A17D5DD840040CFC7 /* TEncRateCtrl.h */,
-				7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */,
-				7874635C17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.h */,
-				7874635D17D5DD840040CFC7 /* TEncSbac.cpp */,
-				7874635E17D5DD840040CFC7 /* TEncSbac.h */,
-				7874635F17D5DD840040CFC7 /* TEncSearch.cpp */,
-				7874636017D5DD840040CFC7 /* TEncSearch.h */,
-				7874636117D5DD840040CFC7 /* TEncSlice.cpp */,
-				7874636217D5DD840040CFC7 /* TEncSlice.h */,
-				7874636317D5DD840040CFC7 /* TEncTop.cpp */,
-				7874636417D5DD840040CFC7 /* TEncTop.h */,
-				7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */,
-				7874636617D5DD840040CFC7 /* WeightPredAnalysis.h */,
-			);
-			path = TLibEncoder;
-			sourceTree = "<group>";
-		};
-		7874636717D5DD840040CFC7 /* TLibExtractor */ = {
-			isa = PBXGroup;
-			children = (
-				7874636817D5DD840040CFC7 /* TExtrTop.cpp */,
-				7874636917D5DD840040CFC7 /* TExtrTop.h */,
-			);
-			path = TLibExtractor;
-			sourceTree = "<group>";
-		};
-		7874636A17D5DD840040CFC7 /* TLibRenderer */ = {
-			isa = PBXGroup;
-			children = (
-				7874636B17D5DD840040CFC7 /* TRenFilter.cpp */,
-				7874636C17D5DD840040CFC7 /* TRenFilter.h */,
-				7874636D17D5DD840040CFC7 /* TRenImage.cpp */,
-				7874636E17D5DD840040CFC7 /* TRenImage.h */,
-				7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */,
-				7874637017D5DD840040CFC7 /* TRenImagePlane.h */,
-				7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */,
-				7874637217D5DD840040CFC7 /* TRenInterpFilter.h */,
-				7874637317D5DD840040CFC7 /* TRenModel.cpp */,
-				7874637417D5DD840040CFC7 /* TRenModel.h */,
-				7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */,
-				7874637617D5DD840040CFC7 /* TRenModSetupStrParser.h */,
-				7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */,
-				7874637817D5DD840040CFC7 /* TRenSingleModel.h */,
-				7874637917D5DD840040CFC7 /* TRenTop.cpp */,
-				7874637A17D5DD840040CFC7 /* TRenTop.h */,
-			);
-			path = TLibRenderer;
-			sourceTree = "<group>";
-		};
-		7874637B17D5DD840040CFC7 /* TLibVideoIO */ = {
-			isa = PBXGroup;
-			children = (
-				7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */,
-				7874637D17D5DD840040CFC7 /* TVideoIOYuv.h */,
-			);
-			path = TLibVideoIO;
-			sourceTree = "<group>";
-		};
-		78C592E7158720BB004401C5 /* App */ = {
-			isa = PBXGroup;
-			children = (
-				787462BA17D5DD7B0040CFC7 /* TAppDecoder */,
-				787462C017D5DD7B0040CFC7 /* TAppEncoder */,
-				787462C617D5DD7B0040CFC7 /* TAppExtractor */,
-				787462CC17D5DD7B0040CFC7 /* TAppRenderer */,
-				787462D217D5DD7B0040CFC7 /* utils */,
+				78486FA61B0B62C70098FD5A /* TAppDecoder */,
+				78486FAC1B0B62C70098FD5A /* TAppEncoder */,
+				78486FB21B0B62C70098FD5A /* TAppExtractor */,
+				78486FB81B0B62C70098FD5A /* TAppRenderer */,
+				78486FBE1B0B62C70098FD5A /* utils */,
 			);
 			name = App;
@@ -928,19 +640,308 @@
 			sourceTree = "<group>";
 		};
-		78C59310158720BB004401C5 /* Lib */ = {
+		78486FA61B0B62C70098FD5A /* TAppDecoder */ = {
 			isa = PBXGroup;
 			children = (
-				787462E217D5DD840040CFC7 /* libmd5 */,
-				787462E617D5DD840040CFC7 /* TAppCommon */,
-				787462EB17D5DD840040CFC7 /* TLibCommon */,
-				7874632317D5DD840040CFC7 /* TLibDecoder */,
-				7874633D17D5DD840040CFC7 /* TLibEncoder */,
-				7874636717D5DD840040CFC7 /* TLibExtractor */,
-				7874636A17D5DD840040CFC7 /* TLibRenderer */,
-				7874637B17D5DD840040CFC7 /* TLibVideoIO */,
-				785E596B17D9AFA8001F6DD1 /* TLibStatistics */,
+				78486FA71B0B62C70098FD5A /* decmain.cpp */,
+				78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */,
+				78486FA91B0B62C70098FD5A /* TAppDecCfg.h */,
+				78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */,
+				78486FAB1B0B62C70098FD5A /* TAppDecTop.h */,
+			);
+			path = TAppDecoder;
+			sourceTree = "<group>";
+		};
+		78486FAC1B0B62C70098FD5A /* TAppEncoder */ = {
+			isa = PBXGroup;
+			children = (
+				78486FAD1B0B62C70098FD5A /* encmain.cpp */,
+				78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */,
+				78486FAF1B0B62C70098FD5A /* TAppEncCfg.h */,
+				78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */,
+				78486FB11B0B62C70098FD5A /* TAppEncTop.h */,
+			);
+			path = TAppEncoder;
+			sourceTree = "<group>";
+		};
+		78486FB21B0B62C70098FD5A /* TAppExtractor */ = {
+			isa = PBXGroup;
+			children = (
+				78486FB31B0B62C70098FD5A /* extrmain.cpp */,
+				78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */,
+				78486FB51B0B62C70098FD5A /* TAppExtrCfg.h */,
+				78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */,
+				78486FB71B0B62C70098FD5A /* TAppExtrTop.h */,
+			);
+			path = TAppExtractor;
+			sourceTree = "<group>";
+		};
+		78486FB81B0B62C70098FD5A /* TAppRenderer */ = {
+			isa = PBXGroup;
+			children = (
+				78486FB91B0B62C70098FD5A /* RendererMain.cpp */,
+				78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */,
+				78486FBB1B0B62C70098FD5A /* TAppRendererCfg.h */,
+				78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */,
+				78486FBD1B0B62C70098FD5A /* TAppRendererTop.h */,
+			);
+			path = TAppRenderer;
+			sourceTree = "<group>";
+		};
+		78486FBE1B0B62C70098FD5A /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				78486FBF1B0B62C70098FD5A /* annexBbytecount.cpp */,
+				78486FC01B0B62C70098FD5A /* BitrateTargeting */,
+				78486FCD1B0B62C70098FD5A /* convert_NtoMbit_YCbCr.cpp */,
+			);
+			path = utils;
+			sourceTree = "<group>";
+		};
+		78486FC01B0B62C70098FD5A /* BitrateTargeting */ = {
+			isa = PBXGroup;
+			children = (
+				78486FC11B0B62C70098FD5A /* encode.shl */,
+				78486FC21B0B62C70098FD5A /* encodeCommand.sh */,
+				78486FC31B0B62C70098FD5A /* ExtractBitrates.cpp */,
+				78486FC41B0B62C70098FD5A /* ExtractBitrates.h */,
+				78486FC51B0B62C70098FD5A /* ExtractBitratesMain.cpp */,
+				78486FC61B0B62C70098FD5A /* GuessLambdaModifiers.cpp */,
+				78486FC71B0B62C70098FD5A /* GuessLambdaModifiers.h */,
+				78486FC81B0B62C70098FD5A /* GuessLambdaModifiersMain.cpp */,
+				78486FC91B0B62C70098FD5A /* makefile */,
+				78486FCA1B0B62C70098FD5A /* QuickStartGuide.pdf */,
+				78486FCB1B0B62C70098FD5A /* RuntimeError.h */,
+				78486FCC1B0B62C70098FD5A /* targetBitrates.sh */,
+			);
+			path = BitrateTargeting;
+			sourceTree = "<group>";
+		};
+		78486FCE1B0B62C70098FD5A /* Lib */ = {
+			isa = PBXGroup;
+			children = (
+				78486FCF1B0B62C70098FD5A /* libmd5 */,
+				78486FD31B0B62C70098FD5A /* TAppCommon */,
+				78486FD81B0B62C70098FD5A /* TLibCommon */,
+				784870181B0B62C70098FD5A /* TLibDecoder */,
+				784870321B0B62C70098FD5A /* TLibEncoder */,
+				7848705D1B0B62C70098FD5A /* TLibExtractor */,
+				784870601B0B62C70098FD5A /* TLibRenderer */,
+				784870711B0B62C70098FD5A /* TLibVideoIO */,
 			);
 			name = Lib;
 			path = source/Lib;
+			sourceTree = "<group>";
+		};
+		78486FCF1B0B62C70098FD5A /* libmd5 */ = {
+			isa = PBXGroup;
+			children = (
+				78486FD01B0B62C70098FD5A /* libmd5.c */,
+				78486FD11B0B62C70098FD5A /* libmd5.h */,
+				78486FD21B0B62C70098FD5A /* MD5.h */,
+			);
+			path = libmd5;
+			sourceTree = "<group>";
+		};
+		78486FD31B0B62C70098FD5A /* TAppCommon */ = {
+			isa = PBXGroup;
+			children = (
+				78486FD41B0B62C70098FD5A /* program_options_lite.cpp */,
+				78486FD51B0B62C70098FD5A /* program_options_lite.h */,
+				78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */,
+				78486FD71B0B62C70098FD5A /* TAppComCamPara.h */,
+			);
+			path = TAppCommon;
+			sourceTree = "<group>";
+		};
+		78486FD81B0B62C70098FD5A /* TLibCommon */ = {
+			isa = PBXGroup;
+			children = (
+				78486FD91B0B62C70098FD5A /* AccessUnit.h */,
+				78486FDA1B0B62C70098FD5A /* CommonDef.h */,
+				78486FDB1B0B62C70098FD5A /* ContextModel.cpp */,
+				78486FDC1B0B62C70098FD5A /* ContextModel.h */,
+				78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */,
+				78486FDE1B0B62C70098FD5A /* ContextModel3DBuffer.h */,
+				78486FDF1B0B62C70098FD5A /* ContextTables.h */,
+				78486FE01B0B62C70098FD5A /* Debug.cpp */,
+				78486FE11B0B62C70098FD5A /* Debug.h */,
+				78486FE21B0B62C70098FD5A /* NAL.h */,
+				78486FE31B0B62C70098FD5A /* SEI.cpp */,
+				78486FE41B0B62C70098FD5A /* SEI.h */,
+				78486FE51B0B62C70098FD5A /* TComBitCounter.h */,
+				78486FE61B0B62C70098FD5A /* TComBitStream.cpp */,
+				78486FE71B0B62C70098FD5A /* TComBitStream.h */,
+				78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */,
+				78486FE91B0B62C70098FD5A /* TComCABACTables.h */,
+				78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */,
+				78486FEB1B0B62C70098FD5A /* TComChromaFormat.h */,
+				78486FEC1B0B62C70098FD5A /* TComCodingStatistics.h */,
+				78486FED1B0B62C70098FD5A /* TComDataCU.cpp */,
+				78486FEE1B0B62C70098FD5A /* TComDataCU.h */,
+				78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */,
+				78486FF01B0B62C70098FD5A /* TComInterpolationFilter.h */,
+				78486FF11B0B62C70098FD5A /* TComList.h */,
+				78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */,
+				78486FF31B0B62C70098FD5A /* TComLoopFilter.h */,
+				78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */,
+				78486FF51B0B62C70098FD5A /* TComMotionInfo.h */,
+				78486FF61B0B62C70098FD5A /* TComMv.h */,
+				78486FF71B0B62C70098FD5A /* TComPattern.cpp */,
+				78486FF81B0B62C70098FD5A /* TComPattern.h */,
+				78486FF91B0B62C70098FD5A /* TComPic.cpp */,
+				78486FFA1B0B62C70098FD5A /* TComPic.h */,
+				78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */,
+				78486FFC1B0B62C70098FD5A /* TComPicSym.h */,
+				78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */,
+				78486FFE1B0B62C70098FD5A /* TComPicYuv.h */,
+				78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */,
+				784870001B0B62C70098FD5A /* TComPrediction.cpp */,
+				784870011B0B62C70098FD5A /* TComPrediction.h */,
+				784870021B0B62C70098FD5A /* TComRdCost.cpp */,
+				784870031B0B62C70098FD5A /* TComRdCost.h */,
+				784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */,
+				784870051B0B62C70098FD5A /* TComRdCostWeightPrediction.h */,
+				784870061B0B62C70098FD5A /* TComRectangle.h */,
+				784870071B0B62C70098FD5A /* TComRom.cpp */,
+				784870081B0B62C70098FD5A /* TComRom.h */,
+				784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */,
+				7848700A1B0B62C70098FD5A /* TComSampleAdaptiveOffset.h */,
+				7848700B1B0B62C70098FD5A /* TComSlice.cpp */,
+				7848700C1B0B62C70098FD5A /* TComSlice.h */,
+				7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */,
+				7848700E1B0B62C70098FD5A /* TComTrQuant.h */,
+				7848700F1B0B62C70098FD5A /* TComTU.cpp */,
+				784870101B0B62C70098FD5A /* TComTU.h */,
+				784870111B0B62C70098FD5A /* TComWedgelet.cpp */,
+				784870121B0B62C70098FD5A /* TComWedgelet.h */,
+				784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */,
+				784870141B0B62C70098FD5A /* TComWeightPrediction.h */,
+				784870151B0B62C70098FD5A /* TComYuv.cpp */,
+				784870161B0B62C70098FD5A /* TComYuv.h */,
+				784870171B0B62C70098FD5A /* TypeDef.h */,
+			);
+			path = TLibCommon;
+			sourceTree = "<group>";
+		};
+		784870181B0B62C70098FD5A /* TLibDecoder */ = {
+			isa = PBXGroup;
+			children = (
+				784870191B0B62C70098FD5A /* AnnexBread.cpp */,
+				7848701A1B0B62C70098FD5A /* AnnexBread.h */,
+				7848701B1B0B62C70098FD5A /* NALread.cpp */,
+				7848701C1B0B62C70098FD5A /* NALread.h */,
+				7848701D1B0B62C70098FD5A /* SEIread.cpp */,
+				7848701E1B0B62C70098FD5A /* SEIread.h */,
+				7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */,
+				784870201B0B62C70098FD5A /* SyntaxElementParser.h */,
+				784870211B0B62C70098FD5A /* TDecBinCoder.h */,
+				784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */,
+				784870231B0B62C70098FD5A /* TDecBinCoderCABAC.h */,
+				784870241B0B62C70098FD5A /* TDecCAVLC.cpp */,
+				784870251B0B62C70098FD5A /* TDecCAVLC.h */,
+				784870261B0B62C70098FD5A /* TDecCu.cpp */,
+				784870271B0B62C70098FD5A /* TDecCu.h */,
+				784870281B0B62C70098FD5A /* TDecEntropy.cpp */,
+				784870291B0B62C70098FD5A /* TDecEntropy.h */,
+				7848702A1B0B62C70098FD5A /* TDecGop.cpp */,
+				7848702B1B0B62C70098FD5A /* TDecGop.h */,
+				7848702C1B0B62C70098FD5A /* TDecSbac.cpp */,
+				7848702D1B0B62C70098FD5A /* TDecSbac.h */,
+				7848702E1B0B62C70098FD5A /* TDecSlice.cpp */,
+				7848702F1B0B62C70098FD5A /* TDecSlice.h */,
+				784870301B0B62C70098FD5A /* TDecTop.cpp */,
+				784870311B0B62C70098FD5A /* TDecTop.h */,
+			);
+			path = TLibDecoder;
+			sourceTree = "<group>";
+		};
+		784870321B0B62C70098FD5A /* TLibEncoder */ = {
+			isa = PBXGroup;
+			children = (
+				784870331B0B62C70098FD5A /* AnnexBwrite.h */,
+				784870341B0B62C70098FD5A /* NALwrite.cpp */,
+				784870351B0B62C70098FD5A /* NALwrite.h */,
+				784870361B0B62C70098FD5A /* SEIEncoder.cpp */,
+				784870371B0B62C70098FD5A /* SEIEncoder.h */,
+				784870381B0B62C70098FD5A /* SEIwrite.cpp */,
+				784870391B0B62C70098FD5A /* SEIwrite.h */,
+				7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */,
+				7848703B1B0B62C70098FD5A /* SyntaxElementWriter.h */,
+				7848703C1B0B62C70098FD5A /* TEncAnalyze.h */,
+				7848703D1B0B62C70098FD5A /* TEncBinCoder.h */,
+				7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */,
+				7848703F1B0B62C70098FD5A /* TEncBinCoderCABAC.h */,
+				784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */,
+				784870411B0B62C70098FD5A /* TEncBinCoderCABACCounter.h */,
+				784870421B0B62C70098FD5A /* TEncCavlc.cpp */,
+				784870431B0B62C70098FD5A /* TEncCavlc.h */,
+				784870441B0B62C70098FD5A /* TEncCfg.h */,
+				784870451B0B62C70098FD5A /* TEncCu.cpp */,
+				784870461B0B62C70098FD5A /* TEncCu.h */,
+				784870471B0B62C70098FD5A /* TEncEntropy.cpp */,
+				784870481B0B62C70098FD5A /* TEncEntropy.h */,
+				784870491B0B62C70098FD5A /* TEncGOP.cpp */,
+				7848704A1B0B62C70098FD5A /* TEncGOP.h */,
+				7848704B1B0B62C70098FD5A /* TEncPic.cpp */,
+				7848704C1B0B62C70098FD5A /* TEncPic.h */,
+				7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */,
+				7848704E1B0B62C70098FD5A /* TEncPreanalyzer.h */,
+				7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */,
+				784870501B0B62C70098FD5A /* TEncRateCtrl.h */,
+				784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */,
+				784870521B0B62C70098FD5A /* TEncSampleAdaptiveOffset.h */,
+				784870531B0B62C70098FD5A /* TEncSbac.cpp */,
+				784870541B0B62C70098FD5A /* TEncSbac.h */,
+				784870551B0B62C70098FD5A /* TEncSearch.cpp */,
+				784870561B0B62C70098FD5A /* TEncSearch.h */,
+				784870571B0B62C70098FD5A /* TEncSlice.cpp */,
+				784870581B0B62C70098FD5A /* TEncSlice.h */,
+				784870591B0B62C70098FD5A /* TEncTop.cpp */,
+				7848705A1B0B62C70098FD5A /* TEncTop.h */,
+				7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */,
+				7848705C1B0B62C70098FD5A /* WeightPredAnalysis.h */,
+			);
+			path = TLibEncoder;
+			sourceTree = "<group>";
+		};
+		7848705D1B0B62C70098FD5A /* TLibExtractor */ = {
+			isa = PBXGroup;
+			children = (
+				7848705E1B0B62C70098FD5A /* TExtrTop.cpp */,
+				7848705F1B0B62C70098FD5A /* TExtrTop.h */,
+			);
+			path = TLibExtractor;
+			sourceTree = "<group>";
+		};
+		784870601B0B62C70098FD5A /* TLibRenderer */ = {
+			isa = PBXGroup;
+			children = (
+				784870611B0B62C70098FD5A /* TRenFilter.cpp */,
+				784870621B0B62C70098FD5A /* TRenFilter.h */,
+				784870631B0B62C70098FD5A /* TRenImage.cpp */,
+				784870641B0B62C70098FD5A /* TRenImage.h */,
+				784870651B0B62C70098FD5A /* TRenImagePlane.cpp */,
+				784870661B0B62C70098FD5A /* TRenImagePlane.h */,
+				784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */,
+				784870681B0B62C70098FD5A /* TRenInterpFilter.h */,
+				784870691B0B62C70098FD5A /* TRenModel.cpp */,
+				7848706A1B0B62C70098FD5A /* TRenModel.h */,
+				7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */,
+				7848706C1B0B62C70098FD5A /* TRenModSetupStrParser.h */,
+				7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */,
+				7848706E1B0B62C70098FD5A /* TRenSingleModel.h */,
+				7848706F1B0B62C70098FD5A /* TRenTop.cpp */,
+				784870701B0B62C70098FD5A /* TRenTop.h */,
+			);
+			path = TLibRenderer;
+			sourceTree = "<group>";
+		};
+		784870711B0B62C70098FD5A /* TLibVideoIO */ = {
+			isa = PBXGroup;
+			children = (
+				784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */,
+				784870731B0B62C70098FD5A /* TVideoIOYuv.h */,
+			);
+			path = TLibVideoIO;
 			sourceTree = "<group>";
 		};
@@ -1208,5 +1209,5 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0620;
 			};
 			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "HTM" */;
@@ -1245,29 +1246,32 @@
 			buildActionMask = 2147483647;
 			files = (
-				7874639417D5DE070040CFC7 /* TComPrediction.cpp in Sources */,
-				7874639517D5DE070040CFC7 /* TComRdCost.cpp in Sources */,
-				7874639617D5DE070040CFC7 /* TComRdCostWeightPrediction.cpp in Sources */,
-				7874639717D5DE070040CFC7 /* TComRom.cpp in Sources */,
-				7874639817D5DE070040CFC7 /* TComSampleAdaptiveOffset.cpp in Sources */,
-				7874639917D5DE070040CFC7 /* TComSlice.cpp in Sources */,
-				7874639A17D5DE070040CFC7 /* TComTrQuant.cpp in Sources */,
-				7874639B17D5DE070040CFC7 /* TComWedgelet.cpp in Sources */,
-				7874639C17D5DE070040CFC7 /* TComWeightPrediction.cpp in Sources */,
-				7874639D17D5DE070040CFC7 /* TComYuv.cpp in Sources */,
-				7874639E17D5DE230040CFC7 /* TComMotionInfo.cpp in Sources */,
-				7874639F17D5DE230040CFC7 /* TComPattern.cpp in Sources */,
-				787463A017D5DE230040CFC7 /* TComPic.cpp in Sources */,
-				787463A117D5DE230040CFC7 /* TComPicSym.cpp in Sources */,
-				787463A217D5DE230040CFC7 /* TComPicYuv.cpp in Sources */,
-				787463A317D5DE230040CFC7 /* TComPicYuvMD5.cpp in Sources */,
-				787463A417D5DE400040CFC7 /* TComCABACTables.cpp in Sources */,
-				787463A517D5DE400040CFC7 /* TComDataCU.cpp in Sources */,
-				787463A617D5DE400040CFC7 /* TComInterpolationFilter.cpp in Sources */,
-				787463A717D5DE400040CFC7 /* TComLoopFilter.cpp in Sources */,
-				787463A817D5DE4B0040CFC7 /* TComBitStream.cpp in Sources */,
-				787463A917D5DE640040CFC7 /* ContextModel.cpp in Sources */,
-				787463AA17D5DE640040CFC7 /* ContextModel3DBuffer.cpp in Sources */,
-				787463AB17D5DE640040CFC7 /* SEI.cpp in Sources */,
-				787463B717D5DED40040CFC7 /* libmd5.c in Sources */,
+				784870871B0B63230098FD5A /* TComCABACTables.cpp in Sources */,
+				7848709C1B0B63230098FD5A /* TComYuv.cpp in Sources */,
+				7848709A1B0B63230098FD5A /* TComWedgelet.cpp in Sources */,
+				784870931B0B63230098FD5A /* TComRdCost.cpp in Sources */,
+				784870881B0B63230098FD5A /* TComChromaFormat.cpp in Sources */,
+				7848708A1B0B63230098FD5A /* TComInterpolationFilter.cpp in Sources */,
+				784870C61B0B63740098FD5A /* libmd5.c in Sources */,
+				7848709B1B0B63230098FD5A /* TComWeightPrediction.cpp in Sources */,
+				784870941B0B63230098FD5A /* TComRdCostWeightPrediction.cpp in Sources */,
+				784870831B0B63230098FD5A /* ContextModel3DBuffer.cpp in Sources */,
+				7848708E1B0B63230098FD5A /* TComPic.cpp in Sources */,
+				784870961B0B63230098FD5A /* TComSampleAdaptiveOffset.cpp in Sources */,
+				784870851B0B63230098FD5A /* SEI.cpp in Sources */,
+				784870971B0B63230098FD5A /* TComSlice.cpp in Sources */,
+				784870981B0B63230098FD5A /* TComTrQuant.cpp in Sources */,
+				7848708D1B0B63230098FD5A /* TComPattern.cpp in Sources */,
+				784870891B0B63230098FD5A /* TComDataCU.cpp in Sources */,
+				7848708B1B0B63230098FD5A /* TComLoopFilter.cpp in Sources */,
+				7848708F1B0B63230098FD5A /* TComPicSym.cpp in Sources */,
+				784870991B0B63230098FD5A /* TComTU.cpp in Sources */,
+				784870861B0B63230098FD5A /* TComBitStream.cpp in Sources */,
+				784870951B0B63230098FD5A /* TComRom.cpp in Sources */,
+				784870911B0B63230098FD5A /* TComPicYuvMD5.cpp in Sources */,
+				784870821B0B63230098FD5A /* ContextModel.cpp in Sources */,
+				784870841B0B63230098FD5A /* Debug.cpp in Sources */,
+				7848708C1B0B63230098FD5A /* TComMotionInfo.cpp in Sources */,
+				784870921B0B63230098FD5A /* TComPrediction.cpp in Sources */,
+				784870901B0B63230098FD5A /* TComPicYuv.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1277,16 +1281,16 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463B817D5DEE80040CFC7 /* AnnexBread.cpp in Sources */,
-				787463B917D5DEE80040CFC7 /* NALread.cpp in Sources */,
-				787463BA17D5DEE80040CFC7 /* SEIread.cpp in Sources */,
-				787463BB17D5DEE80040CFC7 /* SyntaxElementParser.cpp in Sources */,
-				787463BC17D5DEE80040CFC7 /* TDecBinCoderCABAC.cpp in Sources */,
-				787463BD17D5DEE80040CFC7 /* TDecCAVLC.cpp in Sources */,
-				787463BE17D5DEE80040CFC7 /* TDecCu.cpp in Sources */,
-				787463BF17D5DEE80040CFC7 /* TDecEntropy.cpp in Sources */,
-				787463C017D5DEE80040CFC7 /* TDecGop.cpp in Sources */,
-				787463C117D5DEE80040CFC7 /* TDecSbac.cpp in Sources */,
-				787463C217D5DEE80040CFC7 /* TDecSlice.cpp in Sources */,
-				787463C317D5DEE80040CFC7 /* TDecTop.cpp in Sources */,
+				784870A61B0B63360098FD5A /* TDecSbac.cpp in Sources */,
+				784870A51B0B63360098FD5A /* TDecGop.cpp in Sources */,
+				7848709F1B0B63360098FD5A /* SEIread.cpp in Sources */,
+				784870A81B0B63360098FD5A /* TDecTop.cpp in Sources */,
+				784870A41B0B63360098FD5A /* TDecEntropy.cpp in Sources */,
+				7848709D1B0B63360098FD5A /* AnnexBread.cpp in Sources */,
+				784870A31B0B63360098FD5A /* TDecCu.cpp in Sources */,
+				784870A01B0B63360098FD5A /* SyntaxElementParser.cpp in Sources */,
+				784870A71B0B63360098FD5A /* TDecSlice.cpp in Sources */,
+				784870A11B0B63360098FD5A /* TDecBinCoderCABAC.cpp in Sources */,
+				7848709E1B0B63360098FD5A /* NALread.cpp in Sources */,
+				784870A21B0B63360098FD5A /* TDecCAVLC.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1296,23 +1300,23 @@
 			buildActionMask = 2147483647;
 			files = (
-				7874638117D5DDA60040CFC7 /* NALwrite.cpp in Sources */,
-				7874638217D5DDA60040CFC7 /* SEIwrite.cpp in Sources */,
-				7874638317D5DDA60040CFC7 /* SyntaxElementWriter.cpp in Sources */,
-				7874638417D5DDA60040CFC7 /* TEncAnalyze.cpp in Sources */,
-				7874638517D5DDA60040CFC7 /* TEncBinCoderCABAC.cpp in Sources */,
-				7874638617D5DDA60040CFC7 /* TEncBinCoderCABACCounter.cpp in Sources */,
-				7874638717D5DDA60040CFC7 /* TEncCavlc.cpp in Sources */,
-				7874638817D5DDA60040CFC7 /* TEncCu.cpp in Sources */,
-				7874638917D5DDA60040CFC7 /* TEncEntropy.cpp in Sources */,
-				7874638A17D5DDA60040CFC7 /* TEncGOP.cpp in Sources */,
-				7874638B17D5DDA60040CFC7 /* TEncPic.cpp in Sources */,
-				7874638C17D5DDA60040CFC7 /* TEncPreanalyzer.cpp in Sources */,
-				7874638D17D5DDA60040CFC7 /* TEncRateCtrl.cpp in Sources */,
-				7874638E17D5DDA60040CFC7 /* TEncSampleAdaptiveOffset.cpp in Sources */,
-				7874638F17D5DDA60040CFC7 /* TEncSbac.cpp in Sources */,
-				7874639017D5DDA60040CFC7 /* TEncSearch.cpp in Sources */,
-				7874639117D5DDA60040CFC7 /* TEncSlice.cpp in Sources */,
-				7874639217D5DDA60040CFC7 /* TEncTop.cpp in Sources */,
-				7874639317D5DDA60040CFC7 /* WeightPredAnalysis.cpp in Sources */,
+				784870AF1B0B634A0098FD5A /* TEncCavlc.cpp in Sources */,
+				784870AD1B0B634A0098FD5A /* TEncBinCoderCABAC.cpp in Sources */,
+				784870B61B0B634A0098FD5A /* TEncSampleAdaptiveOffset.cpp in Sources */,
+				784870B11B0B634A0098FD5A /* TEncEntropy.cpp in Sources */,
+				784870AA1B0B634A0098FD5A /* SEIEncoder.cpp in Sources */,
+				784870B71B0B634A0098FD5A /* TEncSbac.cpp in Sources */,
+				784870A91B0B634A0098FD5A /* NALwrite.cpp in Sources */,
+				784870B51B0B634A0098FD5A /* TEncRateCtrl.cpp in Sources */,
+				784870AE1B0B634A0098FD5A /* TEncBinCoderCABACCounter.cpp in Sources */,
+				784870B31B0B634A0098FD5A /* TEncPic.cpp in Sources */,
+				784870BB1B0B634A0098FD5A /* WeightPredAnalysis.cpp in Sources */,
+				784870B41B0B634A0098FD5A /* TEncPreanalyzer.cpp in Sources */,
+				784870BA1B0B634A0098FD5A /* TEncTop.cpp in Sources */,
+				784870B21B0B634A0098FD5A /* TEncGOP.cpp in Sources */,
+				784870B01B0B634A0098FD5A /* TEncCu.cpp in Sources */,
+				784870AC1B0B634A0098FD5A /* SyntaxElementWriter.cpp in Sources */,
+				784870AB1B0B634A0098FD5A /* SEIwrite.cpp in Sources */,
+				784870B81B0B634A0098FD5A /* TEncSearch.cpp in Sources */,
+				784870B91B0B634A0098FD5A /* TEncSlice.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1322,5 +1326,5 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463AC17D5DE8A0040CFC7 /* TVideoIOYuv.cpp in Sources */,
+				784870C51B0B63610098FD5A /* TVideoIOYuv.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1330,7 +1334,7 @@
 			buildActionMask = 2147483647;
 			files = (
-				7874637E17D5DD900040CFC7 /* encmain.cpp in Sources */,
-				7874637F17D5DD900040CFC7 /* TAppEncCfg.cpp in Sources */,
-				7874638017D5DD900040CFC7 /* TAppEncTop.cpp in Sources */,
+				784870781B0B62D80098FD5A /* TAppEncCfg.cpp in Sources */,
+				784870791B0B62D80098FD5A /* TAppEncTop.cpp in Sources */,
+				784870771B0B62D80098FD5A /* encmain.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1340,7 +1344,7 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463C417D5DEFB0040CFC7 /* decmain.cpp in Sources */,
-				787463C517D5DEFB0040CFC7 /* TAppDecCfg.cpp in Sources */,
-				787463C617D5DEFB0040CFC7 /* TAppDecTop.cpp in Sources */,
+				784870751B0B62D10098FD5A /* TAppDecCfg.cpp in Sources */,
+				784870741B0B62D10098FD5A /* decmain.cpp in Sources */,
+				784870761B0B62D10098FD5A /* TAppDecTop.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1350,5 +1354,5 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463CD17D5DF220040CFC7 /* TExtrTop.cpp in Sources */,
+				784870BC1B0B63520098FD5A /* TExtrTop.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1358,7 +1362,7 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463C717D5DF080040CFC7 /* extrmain.cpp in Sources */,
-				787463C817D5DF080040CFC7 /* TAppExtrCfg.cpp in Sources */,
-				787463C917D5DF080040CFC7 /* TAppExtrTop.cpp in Sources */,
+				7848707B1B0B62E10098FD5A /* TAppExtrCfg.cpp in Sources */,
+				7848707A1B0B62E10098FD5A /* extrmain.cpp in Sources */,
+				7848707C1B0B62E10098FD5A /* TAppExtrTop.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1368,12 +1372,12 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463AD17D5DE980040CFC7 /* TRenFilter.cpp in Sources */,
-				787463AE17D5DE980040CFC7 /* TRenImage.cpp in Sources */,
-				787463AF17D5DE980040CFC7 /* TRenImagePlane.cpp in Sources */,
-				787463B017D5DE980040CFC7 /* TRenInterpFilter.cpp in Sources */,
-				787463B117D5DE9D0040CFC7 /* TRenModel.cpp in Sources */,
-				787463B217D5DE9D0040CFC7 /* TRenModSetupStrParser.cpp in Sources */,
-				787463B317D5DE9D0040CFC7 /* TRenSingleModel.cpp in Sources */,
-				787463B417D5DE9D0040CFC7 /* TRenTop.cpp in Sources */,
+				784870C41B0B635C0098FD5A /* TRenTop.cpp in Sources */,
+				784870C31B0B635C0098FD5A /* TRenSingleModel.cpp in Sources */,
+				784870BE1B0B635C0098FD5A /* TRenImage.cpp in Sources */,
+				784870C11B0B635C0098FD5A /* TRenModel.cpp in Sources */,
+				784870C21B0B635C0098FD5A /* TRenModSetupStrParser.cpp in Sources */,
+				784870BD1B0B635C0098FD5A /* TRenFilter.cpp in Sources */,
+				784870C01B0B635C0098FD5A /* TRenInterpFilter.cpp in Sources */,
+				784870BF1B0B635C0098FD5A /* TRenImagePlane.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1383,7 +1387,7 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463CA17D5DF0E0040CFC7 /* RendererMain.cpp in Sources */,
-				787463CB17D5DF0E0040CFC7 /* TAppRendererCfg.cpp in Sources */,
-				787463CC17D5DF0E0040CFC7 /* TAppRendererTop.cpp in Sources */,
+				7848707E1B0B62E80098FD5A /* TAppRendererCfg.cpp in Sources */,
+				7848707D1B0B62E80098FD5A /* RendererMain.cpp in Sources */,
+				7848707F1B0B62E80098FD5A /* TAppRendererTop.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1393,6 +1397,6 @@
 			buildActionMask = 2147483647;
 			files = (
-				787463B517D5DEAF0040CFC7 /* program_options_lite.cpp in Sources */,
-				787463B617D5DEAF0040CFC7 /* TAppComCamPara.cpp in Sources */,
+				784870811B0B63040098FD5A /* TAppComCamPara.cpp in Sources */,
+				784870801B0B63040098FD5A /* program_options_lite.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1521,7 +1525,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DDEBUG",
+				);
 			};
 			name = Debug;
@@ -1532,9 +1538,6 @@
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				SDKROOT = macosx;
 			};
 			name = Release;
@@ -1543,5 +1546,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibCommon;
@@ -1552,5 +1555,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibCommon;
@@ -1561,5 +1564,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibDecoder;
@@ -1570,5 +1573,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibDecoder;
@@ -1579,5 +1582,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibEncoder;
@@ -1588,5 +1591,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibEncoder;
@@ -1597,5 +1600,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibVideoIO;
@@ -1606,5 +1609,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibVideoIO;
@@ -1615,5 +1618,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppEncoder;
@@ -1624,5 +1626,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppEncoder;
@@ -1633,5 +1634,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppDecoder;
@@ -1642,5 +1642,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppDecoder;
@@ -1651,5 +1650,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibExtractor;
@@ -1660,5 +1659,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibExtractor;
@@ -1669,5 +1668,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppExtractor;
@@ -1678,5 +1676,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppExtractor;
@@ -1687,5 +1684,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibRenderer;
@@ -1696,5 +1693,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TLibRenderer;
@@ -1705,5 +1702,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppRenderer;
@@ -1714,5 +1710,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = TAppRenderer;
@@ -1723,5 +1718,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TAppCommon;
@@ -1732,5 +1727,5 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				COMBINE_HIDPI_IMAGES = YES;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = TAppCommon;
@@ -1741,5 +1736,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1749,5 +1743,4 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/ContextTables.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/ContextTables.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/ContextTables.h	(revision 1222)
@@ -188,5 +188,5 @@
 #define NUM_SDC_FLAG_CTX              1      ///< number of context 
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
 #define DBBP_NUM_FLAG_CTX                 1
 #endif
@@ -629,5 +629,5 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
 {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.cpp	(revision 1222)
@@ -142,5 +142,5 @@
 #if H_3D_INTER_SDC
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_pbDBBPFlag         = NULL;
 #endif
@@ -273,5 +273,5 @@
 #endif
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
     m_pbDBBPFlag         = (Bool*  )xMalloc(Bool,   uiNumPartition);
 #endif
@@ -493,5 +493,5 @@
 #endif    
 #endif    
-#if H_3D_DBBP
+#if NH_3D_DBBP
     if ( m_pbDBBPFlag         ) { xFree(m_pbDBBPFlag);          m_pbDBBPFlag        = NULL; }
 #endif
@@ -632,6 +632,6 @@
     m_pbSDCFlag[ui] = pcFrom->m_pbSDCFlag[ui];
 #endif
-#if H_3D_DBBP
-    m_pbDBBPFlag[ui] = pcFrom->m_pbDBBPFlag[ui];
+#if NH_3D_DBBP
+  memset( m_pbDBBPFlag , false, m_uiNumPartition * sizeof( *m_pbDBBPFlag ));
 #endif
 #if H_3D
@@ -678,7 +678,4 @@
     m_apDmmPredictor[0] = 0;
     m_apDmmPredictor[1] = 0;
-#endif
-#if H_3D_DBBP
-    memset( m_pbDBBPFlag        + firstElement, false,                    numElements * sizeof( *m_pbDBBPFlag ) );
 #endif
 
@@ -840,5 +837,5 @@
       m_apDmmPredictor[1] = 0;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
       m_pbDBBPFlag[ui] = false;
 #endif
@@ -949,6 +946,6 @@
   m_apDmmPredictor[1] = 0;
 #endif
-#if H_3D_DBBP
-  memset( m_pbDBBPFlag,         0, iSizeInBool  );
+#if NH_3D_DBBP
+  memset( m_pbDBBPFlag,         0, sizeof(Bool) * m_uiNumPartition  );
 #endif
 
@@ -1007,5 +1004,5 @@
 #endif
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
       m_pbDBBPFlag[ui]=pcCU->m_pbDBBPFlag[uiPartOffset+ui];
 #endif
@@ -1130,5 +1127,5 @@
 #endif  
 #endif  
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_pbDBBPFlag              = pcCU->getDBBPFlag()         + uiPart;
 #endif
@@ -1251,5 +1248,5 @@
   m_puhARPW            = pcCU->getARPW()                  + uiAbsPartIdx;
 #endif    
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_pbDBBPFlag       = pcCU->getDBBPFlag()              + uiAbsPartIdx;
 #endif
@@ -1337,5 +1334,5 @@
 #endif
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   memcpy( m_pbDBBPFlag          + uiOffset, pcCU->getDBBPFlag(),          iSizeInBool  );
 #endif
@@ -1465,6 +1462,6 @@
 #endif
 #endif
-#if H_3D_DBBP
-  memcpy( rpcCU->getDBBPFlag()          + m_uiAbsIdxInLCU, m_pbDBBPFlag,          iSizeInBool  );
+#if NH_3D_DBBP
+  memcpy( pCtu->getDBBPFlag()          + m_absZIdxInCtu, m_pbDBBPFlag,          iSizeInBool  );
 #endif
 
@@ -1539,7 +1536,4 @@
   memcpy( rpcCU->getSDCSegmentDCOffset(1) + uiPartOffset, m_apSegmentDCOffset[1], sizeof( Pel ) * uiQNumPart);
 #endif
-#endif
-#if H_3D_DBBP
-  memcpy( rpcCU->getDBBPFlag()          + uiPartOffset, m_pbDBBPFlag,          iSizeInBool  );
 #endif
 #if H_3D_ARP
@@ -2112,7 +2106,11 @@
 }
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Pel* TComDataCU::getVirtualDepthBlock(UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt& uiDepthStride)
 {
+  const TComSPS* sps = getSlice()->getSPS();
+  UInt uiMaxCUWidth = sps->getMaxCUWidth();
+  UInt uiMaxCUHeight = sps->getMaxCUHeight();
+  
   // get coded and reconstructed depth view
   TComPicYuv* depthPicYuv = NULL;
@@ -2150,11 +2148,11 @@
     depthPicYuv   = baseDepthPic->getPicYuvRec();
     depthPicYuv->extendPicBorder();
-    uiDepthStride = depthPicYuv->getStride();
+    uiDepthStride = depthPicYuv->getStride(COMPONENT_Y);
     
-    Int iBlkX = ( getAddr() % baseDepthPic->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ getZorderIdxInCU()+uiAbsPartIdx ] ];
-    Int iBlkY = ( getAddr() / baseDepthPic->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ getZorderIdxInCU()+uiAbsPartIdx ] ];
+    Int iBlkX = ( getCtuRsAddr() % baseDepthPic->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ getZorderIdxInCtu()+uiAbsPartIdx ] ];
+    Int iBlkY = ( getCtuRsAddr() / baseDepthPic->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ getZorderIdxInCtu()+uiAbsPartIdx ] ];
     
-    Int iPictureWidth  = depthPicYuv->getWidth();
-    Int iPictureHeight = depthPicYuv->getHeight();
+    Int iPictureWidth  = depthPicYuv->getWidth(COMPONENT_Y);
+    Int iPictureHeight = depthPicYuv->getHeight(COMPONENT_Y);
     
     
@@ -2173,5 +2171,5 @@
     Int depthPosY = Clip3(0,   iPictureHeight - 1, iBlkY + ((cDv.getVer()+2)>>2));
     
-    pDepthPels = depthPicYuv->getLumaAddr() + depthPosX + depthPosY * uiDepthStride;
+    pDepthPels = depthPicYuv->getAddr(COMPONENT_Y) + depthPosX + depthPosY * uiDepthStride;
   }
 #endif
@@ -2185,5 +2183,5 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TComDataCU::setDBBPFlagSubParts ( Bool bDBBPFlag, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth )
 {
@@ -3705,5 +3703,5 @@
   Bool bARPFlag = getARPW(uiAbsPartIdx) > 0;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Bool bDBBPFlag = getDBBPFlag(uiAbsPartIdx);
   assert(bDBBPFlag == getDBBPFlag(0));  
@@ -3743,5 +3741,5 @@
       && !bARPFlag
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
       && !bDBBPFlag
 #endif
@@ -4055,5 +4053,5 @@
         spiMvpFlag = true;
       }
-#if H_3D_DBBP
+#if NH_3D_DBBP
       spiMvpFlag &= !bDBBPFlag;
 #endif
@@ -4194,5 +4192,5 @@
       (nPSW + nPSH > 12) &&
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
       !bDBBPFlag &&
 #endif
@@ -5126,5 +5124,5 @@
   UInt partAddr;
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( getDBBPFlag(0) )
   {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComDataCU.h	(revision 1222)
@@ -65,5 +65,5 @@
 static const UInt NUM_MOST_PROBABLE_MODES=3;
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 typedef struct _DBBPTmpData
 {
@@ -193,5 +193,5 @@
 #endif
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Bool*         m_pbDBBPFlag;        ///< array of DBBP flags
   DbbpTmpData   m_sDBBPTmpData;
@@ -329,5 +329,5 @@
   Void          setCUTransquantBypassSubParts( Bool flag, UInt uiAbsPartIdx, UInt uiDepth );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Pel*          getVirtualDepthBlock(UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt& uiDepthStride);
 #endif
@@ -353,5 +353,5 @@
   Void          setPredModeSubParts   ( PredMode eMode, UInt uiAbsPartIdx, UInt uiDepth );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Bool*         getDBBPFlag           ()                        { return m_pbDBBPFlag;               }
   Bool          getDBBPFlag           ( UInt uiIdx )            { return m_pbDBBPFlag[uiIdx];        }
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.cpp	(revision 1222)
@@ -747,7 +747,11 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 PartSize TComPrediction::getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU)
 {
+  const TComSPS* sps = pcCU->getSlice()->getSPS();
+  UInt uiMaxCUWidth = sps->getMaxCUWidth();
+  UInt uiMaxCUHeight = sps->getMaxCUHeight();
+  
   // find virtual partitioning for this CU based on depth block
   // segmentation of texture block --> mask IDs
@@ -757,6 +761,6 @@
   Int iSumDepth = 0;
   Int iSubSample = 4;
-  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth();
-  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight();
+  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth(COMPONENT_Y);
+  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight(COMPONENT_Y);
   TComMv cDv = pcCU->getSlice()->getDepthRefinementFlag(  ) ? pcCU->getDvInfo(0).m_acDoNBDV : pcCU->getDvInfo(0).m_acNBDV;
   if( pcCU->getSlice()->getDepthRefinementFlag(  ) )
@@ -764,6 +768,6 @@
     cDv.setVer(0);
   }
-  Int iBlkX = ( pcCU->getAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getHor()+2)>>2);
-  Int iBlkY = ( pcCU->getAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getVer()+2)>>2);
+  Int iBlkX = ( pcCU->getCtuRsAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getHor()+2)>>2);
+  Int iBlkY = ( pcCU->getCtuRsAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getVer()+2)>>2);
   
   UInt t=0;
@@ -852,5 +856,5 @@
   }
 
-  PartSize matchedPartSize = SIZE_NONE;
+  PartSize matchedPartSize = NUMBER_OF_PART_SIZES;
 
   Int iMaxMatchSum = 0;
@@ -867,5 +871,5 @@
   }
 
-  AOF( matchedPartSize != SIZE_NONE );
+  AOF( matchedPartSize != NUMBER_OF_PART_SIZES );
 
   return matchedPartSize;
@@ -874,4 +878,8 @@
 Bool TComPrediction::getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU)
 {
+  const TComSPS* sps = pcCU->getSlice()->getSPS();
+  UInt uiMaxCUWidth = sps->getMaxCUWidth();
+  UInt uiMaxCUHeight = sps->getMaxCUHeight();
+  
   // segmentation of texture block --> mask IDs
   Pel*  pDepthBlockStart      = pDepthPels;
@@ -885,6 +893,6 @@
   iSumDepth  = pDepthPels[ 0 ];
   
-  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth();
-  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight();  
+  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth(COMPONENT_Y);
+  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight(COMPONENT_Y);  
   TComMv cDv = pcCU->getSlice()->getDepthRefinementFlag(  ) ? pcCU->getDvInfo(0).m_acDoNBDV : pcCU->getDvInfo(0).m_acNBDV;
   if( pcCU->getSlice()->getDepthRefinementFlag(  ) )
@@ -892,6 +900,6 @@
     cDv.setVer(0);
   }
-  Int iBlkX = ( pcCU->getAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getHor()+2)>>2);
-  Int iBlkY = ( pcCU->getAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getVer()+2)>>2);
+  Int iBlkX = ( pcCU->getCtuRsAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getHor()+2)>>2);
+  Int iBlkY = ( pcCU->getCtuRsAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getVer()+2)>>2);
   if (iBlkX>(Int)(iPictureWidth - uiWidth))
   {
@@ -1008,10 +1016,10 @@
 }
 
-Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize )
-{
-  Pel*  piSrc[2]    = {pInYuv[0]->getLumaAddr(uiPartAddr), pInYuv[1]->getLumaAddr(uiPartAddr)};
-  UInt  uiSrcStride = pInYuv[0]->getStride();
-  Pel*  piDst       = pOutYuv->getLumaAddr(uiPartAddr);
-  UInt  uiDstStride = pOutYuv->getStride();
+Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize, Int bitDepthY )
+{
+  Pel*  piSrc[2]    = {pInYuv[0]->getAddr(COMPONENT_Y, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Y, uiPartAddr)};
+  UInt  uiSrcStride = pInYuv[0]->getStride(COMPONENT_Y);
+  Pel*  piDst       = pOutYuv->getAddr(COMPONENT_Y, uiPartAddr);
+  UInt  uiDstStride = pOutYuv->getStride(COMPONENT_Y);
   
   UInt  uiMaskStride= MAX_CU_SIZE;
@@ -1052,5 +1060,5 @@
         right  = (x==uiWidth-1)  ? tmpTar[y*uiWidth+x] : tmpTar[y*uiWidth+x+1];
         
-        piDst[x] = (l!=r) ? ClipY( Pel(( left + (tmpTar[y*uiWidth+x] << 1) + right ) >> 2 )) : tmpTar[y*uiWidth+x]; 
+        piDst[x] = (l!=r) ? ClipBD( Pel(( left + (tmpTar[y*uiWidth+x] << 1) + right ) >> 2 ), bitDepthY) : tmpTar[y*uiWidth+x];
       }
       piDst     += uiDstStride;
@@ -1070,5 +1078,5 @@
         bottom = (y==uiHeight-1) ? tmpTar[y*uiWidth+x] : tmpTar[(y+1)*uiWidth+x];
         
-        piDst[x] = (t!=b) ? ClipY( Pel(( top + (tmpTar[y*uiWidth+x] << 1) + bottom ) >> 2 )) : tmpTar[y*uiWidth+x];
+        piDst[x] = (t!=b) ? ClipBD( Pel(( top + (tmpTar[y*uiWidth+x] << 1) + bottom ) >> 2 ), bitDepthY) : tmpTar[y*uiWidth+x];
       }
       piDst     += uiDstStride;
@@ -1083,10 +1091,10 @@
   
   // now combine chroma
-  Pel*  piSrcU[2]       = { pInYuv[0]->getCbAddr(uiPartAddr), pInYuv[1]->getCbAddr(uiPartAddr) };
-  Pel*  piSrcV[2]       = { pInYuv[0]->getCrAddr(uiPartAddr), pInYuv[1]->getCrAddr(uiPartAddr) };
-  UInt  uiSrcStrideC    = pInYuv[0]->getCStride();
-  Pel*  piDstU          = pOutYuv->getCbAddr(uiPartAddr);
-  Pel*  piDstV          = pOutYuv->getCrAddr(uiPartAddr);
-  UInt  uiDstStrideC    = pOutYuv->getCStride();
+  Pel*  piSrcU[2]       = { pInYuv[0]->getAddr(COMPONENT_Cb, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Cb, uiPartAddr) };
+  Pel*  piSrcV[2]       = { pInYuv[0]->getAddr(COMPONENT_Cr, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Cr, uiPartAddr) };
+  UInt  uiSrcStrideC    = pInYuv[0]->getStride(COMPONENT_Cb);
+  Pel*  piDstU          = pOutYuv->getAddr(COMPONENT_Cb, uiPartAddr);
+  Pel*  piDstV          = pOutYuv->getAddr(COMPONENT_Cr, uiPartAddr);
+  UInt  uiDstStrideC    = pOutYuv->getStride(COMPONENT_Cb);
   UInt  uiWidthC        = uiWidth >> 1;
   UInt  uiHeightC       = uiHeight >> 1;
@@ -1134,6 +1142,6 @@
         if (l!=r)
         {
-          filSrcU = ClipC( Pel(( leftU + (tmpTarU[y*uiWidthC+x] << 1) + rightU ) >> 2 ));
-          filSrcV = ClipC( Pel(( leftV + (tmpTarV[y*uiWidthC+x] << 1) + rightV ) >> 2 ));
+          filSrcU = ClipBD( Pel(( leftU + (tmpTarU[y*uiWidthC+x] << 1) + rightU ) >> 2 ), bitDepthY);
+          filSrcV = ClipBD( Pel(( leftV + (tmpTarV[y*uiWidthC+x] << 1) + rightV ) >> 2 ), bitDepthY);
         }
         else
@@ -1167,6 +1175,6 @@
         if (t!=b)
         {
-          filSrcU = ClipC( Pel(( topU + (tmpTarU[y*uiWidthC+x] << 1) + bottomU ) >> 2 ));
-          filSrcV = ClipC( Pel(( topV + (tmpTarV[y*uiWidthC+x] << 1) + bottomV ) >> 2 ));
+          filSrcU = ClipBD( Pel(( topU + (tmpTarU[y*uiWidthC+x] << 1) + bottomU ) >> 2 ), bitDepthY);
+          filSrcV = ClipBD( Pel(( topV + (tmpTarV[y*uiWidthC+x] << 1) + bottomV ) >> 2 ), bitDepthY);
         }
         else
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComPrediction.h	(revision 1222)
@@ -187,8 +187,8 @@
 #endif
   
-#if H_3D_DBBP
+#if NH_3D_DBBP
   PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU);
   Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU);
-  Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );
+  Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize, Int bitDepthY );
 #endif
 
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.cpp	(revision 1222)
@@ -311,5 +311,5 @@
   m_bUseEstimatedVSD        = false; 
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_bUseMask                = false;
 #endif
@@ -340,5 +340,5 @@
   rcDistParam.DistFunc = m_afpDistortFunc[eDFunc + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -397,5 +397,5 @@
   }
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -446,5 +446,5 @@
   }
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -468,5 +468,5 @@
   rcDP.bitDepth   = bitDepth;
   rcDP.DistFunc   = m_afpDistortFunc[ ( bHadamard ? DF_HADS : DF_SADS ) + g_aucConvertToBit[ iWidth ] + 1 ];
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -649,5 +649,5 @@
 // ====================================================================================================================
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 // --------------------------------------------------------------------------------------------------------------------
 // Masked distortion functions
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComRdCost.h	(revision 1222)
@@ -167,5 +167,5 @@
 #endif
   Int                     m_iCostScale;
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Bool                    m_bUseMask;
 #endif
@@ -206,5 +206,5 @@
   Void    setDistParam( DistParam& rcDP, Int bitDepth, Pel* p1, Int iStride1, Pel* p2, Int iStride2, Int iWidth, Int iHeight, Bool bHadamard = false );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void    setUseMask(Bool b) { m_bUseMask = b; }
 #endif
@@ -302,5 +302,5 @@
   static Distortion xCalcHADs4x4      ( Pel *piOrg, Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
   static Distortion xCalcHADs8x8      ( Pel *piOrg, Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
-#if H_3D_DBBP
+#if NH_3D_DBBP
   static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
   static UInt xGetMaskedSAD     ( DistParam* pcDtParam );
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TypeDef.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TypeDef.h	(revision 1222)
@@ -71,4 +71,6 @@
 #define NH_3D_NBDV                        1
 #define NH_3D_NBDV_REF                    1
+
+#define NH_3D_DBBP                         1
 #endif
 
@@ -328,5 +330,5 @@
 #endif
 ///// ***** DEPTH BASED BLOCK PARTITIONING *********
-#if H_3D_DBBP
+#if NH_3D_DBBP
 #define DBBP_INVALID_SHORT                (-4)
 #define DBBP_PACK_MODE               SIZE_2NxN
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1222)
@@ -3400,5 +3400,5 @@
 
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void TDecCavlc::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
   {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.h	(revision 1222)
@@ -127,5 +127,5 @@
   Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void  parseDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.cpp	(revision 1222)
@@ -52,5 +52,5 @@
   m_ppcYuvReco = NULL;
   m_ppcCU      = NULL;
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_ppcYuvRecoDBBP = NULL;
 #endif
@@ -81,5 +81,5 @@
   m_ppcYuvReco = new TComYuv*[m_uiMaxDepth-1];
   m_ppcCU      = new TComDataCU*[m_uiMaxDepth-1];
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_ppcYuvRecoDBBP = new TComYuv*[m_uiMaxDepth-1];
 #endif
@@ -95,6 +95,6 @@
     m_ppcYuvReco[ui] = new TComYuv;    m_ppcYuvReco[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
     m_ppcCU     [ui] = new TComDataCU; m_ppcCU     [ui]->create( chromaFormatIDC, uiNumPartitions, uiWidth, uiHeight, true, uiMaxWidth >> (m_uiMaxDepth - 1) );
-#if H_3D_DBBP
-    m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight );
+#if NH_3D_DBBP
+    m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
 #endif
 }
@@ -119,5 +119,5 @@
     m_ppcYuvReco[ui]->destroy(); delete m_ppcYuvReco[ui]; m_ppcYuvReco[ui] = NULL;
     m_ppcCU     [ui]->destroy(); delete m_ppcCU     [ui]; m_ppcCU     [ui] = NULL;
-#if H_3D_DBBP
+#if NH_3D_DBBP
     m_ppcYuvRecoDBBP[ui]->destroy(); delete m_ppcYuvRecoDBBP[ui]; m_ppcYuvRecoDBBP[ui] = NULL;
 #endif
@@ -127,5 +127,5 @@
   delete [] m_ppcYuvReco; m_ppcYuvReco = NULL;
   delete [] m_ppcCU     ; m_ppcCU      = NULL;
-#if H_3D_DBBP
+#if NH_3D_DBBP
   delete [] m_ppcYuvRecoDBBP; m_ppcYuvRecoDBBP = NULL;
 #endif
@@ -616,5 +616,5 @@
   {
     case MODE_INTER:
-#if H_3D_DBBP
+#if NH_3D_DBBP
     if( m_ppcCU[uiDepth]->getDBBPFlag(0) )
     {
@@ -636,5 +636,5 @@
       }
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
     }
 #endif
@@ -844,5 +844,5 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TDecCu::xReconInterDBBP( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -850,4 +850,6 @@
   AOF(!pcCU->getSlice()->isIntra());
   PartSize ePartSize = pcCU->getPartitionSize( 0 );
+  
+  Int bitDepthY = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
   
   // get collocated depth block
@@ -870,5 +872,5 @@
   
   // first, extract the two sets of motion parameters
-  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
+  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
   for( UInt uiSegment = 0; uiSegment < 2; uiSegment++ )
   {
@@ -883,8 +885,10 @@
     }
     
+#if H_3D
     AOF( pcCU->getARPW(uiPartAddr) == 0 );
     AOF( pcCU->getICFlag(uiPartAddr) == false );
     AOF( pcCU->getSPIVMPFlag(uiPartAddr) == false );
     AOF( pcCU->getVSPFlag(uiPartAddr) == 0 );
+#endif
   }
   
@@ -926,13 +930,13 @@
   
   // reconstruct final prediction signal by combining both segments
-  m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize);
+  m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize, bitDepthY);
 
   // inter recon
-  xDecodeInterTexture( pcCU, 0, uiDepth );
+  xDecodeInterTexture( pcCU, uiDepth );
   
   // clip for only non-zero cbp case
-  if  ( ( pcCU->getCbf( 0, TEXT_LUMA ) ) || ( pcCU->getCbf( 0, TEXT_CHROMA_U ) ) || ( pcCU->getCbf(0, TEXT_CHROMA_V ) ) )
-  {
-    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ) );
+  if  ( ( pcCU->getCbf( 0, COMPONENT_Y ) ) || ( pcCU->getCbf( 0, COMPONENT_Cb ) ) || ( pcCU->getCbf(0, COMPONENT_Cr ) ) )
+  {
+    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getSPS()->getBitDepths() );
   }
   else
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCu.h	(revision 1222)
@@ -62,5 +62,5 @@
   TComDataCU**        m_ppcCU;            ///< CU data array
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   TComYuv**           m_ppcYuvRecoDBBP;
 #endif
@@ -102,5 +102,5 @@
   Void xReconInter              ( TComDataCU* pcCU, UInt uiDepth );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void xReconInterDBBP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp	(revision 1222)
@@ -181,4 +181,6 @@
   {
     decodePUWise( pcCU, uiAbsPartIdx, uiDepth, pcSubCU );
+    
+    decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth );
   }
 }
@@ -292,5 +294,4 @@
 
   ////// Parse CUs extension syntax
-  decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth ); 
   decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth ); 
 
@@ -308,5 +309,5 @@
     {
       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-#if H_3D_DBBP
+#if NH_3D_DBBP
       if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
 #else
@@ -395,5 +396,5 @@
           pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
 #if H_3D_VSP
-#if H_3D_DBBP
+#if NH_3D_DBBP
           if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 && !pcCU->getDBBPFlag( uiAbsPartIdx ) )
 #else
@@ -1060,5 +1061,5 @@
 }
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TDecEntropy::decodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecEntropy.h	(revision 1222)
@@ -95,5 +95,5 @@
   virtual Void parseSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   virtual Void parseDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
 #endif
@@ -183,5 +183,5 @@
   Void decodeSDCFlag           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void decodeDBBPFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp	(revision 1222)
@@ -119,5 +119,5 @@
 , m_cSDCFlagSCModel                  ( 1,             1,  NUM_SDC_FLAG_CTX                 , m_contextModels + m_numContextModels, m_numContextModels)
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
 , m_cDBBPFlagSCModel             ( 1,             1,                 DBBP_NUM_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
 #endif
@@ -210,5 +210,5 @@
   m_cSDCFlagSCModel.initBuffer            ( sliceType, qp, (UChar*)INIT_SDC_FLAG );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_cDBBPFlagSCModel.initBuffer              ( sliceType, qp, (UChar*)INIT_DBBP_FLAG );
 #endif
@@ -259,7 +259,4 @@
 #if H_3D_DIM_SDC
   m_cSDCFlagSCModel.initBuffer            ( eSliceType, iQp, (UChar*)INIT_SDC_FLAG );
-#endif
-#if H_3D_DBBP
-  m_cDBBPFlagSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_DBBP_FLAG );
 #endif
 
@@ -2541,5 +2538,5 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -2553,5 +2550,5 @@
   PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
   AOF( ePartSize == SIZE_2NxN || ePartSize == SIZE_Nx2N );
-  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
+  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
   pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx, 0, uiDepth);
   pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx+uiPUOffset, 1, uiDepth);
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.h	(revision 1222)
@@ -121,5 +121,5 @@
   Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void parseDBBPFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
@@ -240,5 +240,5 @@
   ContextModel3DBuffer m_cSDCFlagSCModel;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   ContextModel3DBuffer m_cDBBPFlagSCModel;
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1222)
@@ -2901,5 +2901,5 @@
 #endif
     
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TEncCavlc::codeDBBPFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCavlc.h	(revision 1222)
@@ -136,5 +136,5 @@
   Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void codeDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.cpp	(revision 1222)
@@ -79,5 +79,5 @@
   m_ppcRecoYuvTemp = new TComYuv*[m_uhTotalDepth-1];
   m_ppcOrigYuv     = new TComYuv*[m_uhTotalDepth-1];
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_ppcOrigYuvDBBP = new TComYuv*[m_uhTotalDepth-1];
 #endif
@@ -105,6 +105,6 @@
 
     m_ppcOrigYuv    [i] = new TComYuv; m_ppcOrigYuv    [i]->create(uiWidth, uiHeight, chromaFormat);
-#if H_3D_DBBP
-    m_ppcOrigYuvDBBP[i] = new TComYuv; m_ppcOrigYuvDBBP[i]->create(uiWidth, uiHeight);
+#if NH_3D_DBBP
+    m_ppcOrigYuvDBBP[i] = new TComYuv; m_ppcOrigYuvDBBP[i]->create(uiWidth, uiHeight, chromaFormat);
 #endif
 
@@ -180,5 +180,5 @@
       m_ppcOrigYuv[i]->destroy();     delete m_ppcOrigYuv[i];     m_ppcOrigYuv[i] = NULL;
     }
-#if H_3D_DBBP
+#if NH_3D_DBBP
     if(m_ppcOrigYuvDBBP[i])
     {
@@ -240,5 +240,5 @@
     m_ppcOrigYuv = NULL;
   }
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if(m_ppcOrigYuvDBBP)
   {
@@ -693,5 +693,5 @@
             rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
             if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
             {
@@ -1611,5 +1611,5 @@
   // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
   m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
-#if H_3D
+#if NH_3D_DBBP
   m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
 #endif
@@ -2384,13 +2384,13 @@
 }
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TEncCu::xInvalidateOriginalSegments( TComYuv* pOrigYuv, TComYuv* pOrigYuvTemp, Bool* pMask, UInt uiValidSegment )
 {
-  UInt  uiWidth     = pOrigYuv->getWidth ( );
-  UInt  uiHeight    = pOrigYuv->getHeight( );
-  Pel*  piSrc       = pOrigYuv->getLumaAddr( );
-  UInt  uiSrcStride = pOrigYuv->getStride();
-  Pel*  piDst       = pOrigYuvTemp->getLumaAddr( );
-  UInt  uiDstStride = pOrigYuvTemp->getStride();
+  UInt  uiWidth     = pOrigYuv->getWidth (COMPONENT_Y);
+  UInt  uiHeight    = pOrigYuv->getHeight(COMPONENT_Y);
+  Pel*  piSrc       = pOrigYuv->getAddr(COMPONENT_Y);
+  UInt  uiSrcStride = pOrigYuv->getStride(COMPONENT_Y);
+  Pel*  piDst       = pOrigYuvTemp->getAddr(COMPONENT_Y);
+  UInt  uiDstStride = pOrigYuvTemp->getStride(COMPONENT_Y);
   
   UInt  uiMaskStride= MAX_CU_SIZE;
@@ -2417,10 +2417,10 @@
   
   // now invalidate chroma
-  Pel*  piSrcU       = pOrigYuv->getCbAddr();
-  Pel*  piSrcV       = pOrigYuv->getCrAddr();
-  UInt  uiSrcStrideC = pOrigYuv->getCStride();
-  Pel*  piDstU       = pOrigYuvTemp->getCbAddr( );
-  Pel*  piDstV       = pOrigYuvTemp->getCrAddr( );
-  UInt  uiDstStrideC = pOrigYuvTemp->getCStride();
+  Pel*  piSrcU       = pOrigYuv->getAddr(COMPONENT_Cb);
+  Pel*  piSrcV       = pOrigYuv->getAddr(COMPONENT_Cr);
+  UInt  uiSrcStrideC = pOrigYuv->getStride(COMPONENT_Cb);
+  Pel*  piDstU       = pOrigYuvTemp->getAddr(COMPONENT_Cb);
+  Pel*  piDstV       = pOrigYuvTemp->getAddr(COMPONENT_Cr);
+  UInt  uiDstStrideC = pOrigYuvTemp->getStride(COMPONENT_Cb);
   pMask = pMaskStart;
   
@@ -2443,5 +2443,7 @@
   }
 }
-
+#endif
+
+#if H_3D_DIS
 Void TEncCu::xCheckRDCostDIS( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize eSize )
 {
@@ -2517,5 +2519,7 @@
   xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth);
 }
-
+#endif
+
+#if NH_3D_DBBP
 Void TEncCu::xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, Bool bUseMRG )
 {
@@ -2539,5 +2543,5 @@
   AOF( uiWidth == uiHeight );
   
-#if H_3D_DBBP
+#if NH_3D_DBBP
   // Is this correct here, was under the macro SEC_DBBP_DISALLOW_8x8_I0078, however the function is related to Single Depth Mode
   if(uiWidth <= 8)
@@ -2591,5 +2595,6 @@
     rpcTempCU->getDBBPTmpData()->eVirtualPartSize = eVirtualPartSize;
     rpcTempCU->getDBBPTmpData()->uiVirtualPartIndex = uiSegment;
-    m_pcPredSearch->predInterSearch( rpcTempCU, m_ppcOrigYuvDBBP[uhDepth], apPredYuv[uiSegment], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], false, false, bUseMRG );
+
+    m_pcPredSearch->predInterSearch( rpcTempCU, m_ppcOrigYuvDBBP[uhDepth], apPredYuv[uiSegment], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], false, bUseMRG );
     m_pcRdCost->setUseMask(false);
     
@@ -2599,7 +2604,9 @@
     pDBBPTmpData->abMergeFlag[uiSegment] = rpcTempCU->getMergeFlag(0);
     pDBBPTmpData->auhMergeIndex[uiSegment] = rpcTempCU->getMergeIndex(0);
-    
+
+#if NH_3D_VSP
     AOF( rpcTempCU->getSPIVMPFlag(0) == false );
     AOF( rpcTempCU->getVSPFlag(0) == 0 );
+#endif
     
     for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
@@ -2620,5 +2627,5 @@
   rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
   
-  UInt uiPUOffset = ( g_auiPUOffset[UInt( eVirtualPartSize )] << ( ( rpcTempCU->getSlice()->getSPS()->getMaxCUDepth() - uhDepth ) << 1 ) ) >> 4;
+  UInt uiPUOffset = ( g_auiPUOffset[UInt( eVirtualPartSize )] << ( ( rpcTempCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uhDepth ) << 1 ) ) >> 4;
   for( UInt uiSegment = 0; uiSegment < 2; uiSegment++ )
   {
@@ -2646,5 +2653,6 @@
   
   // reconstruct final prediction signal by combining both segments
-  m_pcPredSearch->combineSegmentsWithMask(apPredYuv, m_ppcPredYuvTemp[uhDepth], pMask, uiWidth, uiHeight, 0, eVirtualPartSize);
+  Int bitDepthY = rpcTempCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
+  m_pcPredSearch->combineSegmentsWithMask(apPredYuv, m_ppcPredYuvTemp[uhDepth], pMask, uiWidth, uiHeight, 0, eVirtualPartSize, bitDepthY);
   m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false );
   
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncCu.h	(revision 1222)
@@ -82,5 +82,5 @@
   TComYuv**               m_ppcOrigYuv;     ///< Original Yuv for each depth
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   TComYuv**               m_ppcOrigYuvDBBP;
 #endif
@@ -155,5 +155,5 @@
   Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize  );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void  xInvalidateOriginalSegments( TComYuv* pOrigYuv, TComYuv* pOrigYuvTemp, Bool* pMask, UInt uiValidSegment );
   Void  xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, Bool bUseMRG = false );
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 1222)
@@ -870,8 +870,13 @@
 
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TEncEntropy::encodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
-  if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && 
+  if( bRD )
+  {
+    uiAbsPartIdx = 0;
+  }
+  
+  if( pcCU->getSlice()->getDepthBasedBlkPartFlag() &&
     ( pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || 
       pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && 
@@ -879,8 +884,4 @@
       pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
   {
-    if( bRD )
-    {
-      uiAbsPartIdx = 0;
-    }
     m_pcEntropyCoderIf->codeDBBPFlag( pcCU, uiAbsPartIdx );
   }
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncEntropy.h	(revision 1222)
@@ -94,5 +94,5 @@
   virtual Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   virtual Void codeDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
 #endif
@@ -183,5 +183,5 @@
   Void encodeSDCFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void encodeDBBPFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 1222)
@@ -114,5 +114,5 @@
 , m_cSDCFlagSCModel                    ( 1,             1,                       NUM_SDC_FLAG_CTX                    , m_contextModels + m_numContextModels, m_numContextModels)
 #endif                                                                                                          
-#if H_3D_DBBP                                                                                                  
+#if NH_3D_DBBP
 , m_cDBBPFlagSCModel                   ( 1,             1,                       DBBP_NUM_FLAG_CTX                   , m_contextModels + m_numContextModels, m_numContextModels)
 #endif
@@ -194,5 +194,5 @@
   m_cSDCFlagSCModel.initBuffer                    ( eSliceType, iQp, (UChar*)INIT_SDC_FLAG );
 #endif                                           
-#if H_3D_DBBP                                    
+#if NH_3D_DBBP
   m_cDBBPFlagSCModel.initBuffer                   ( eSliceType, iQp, (UChar*)INIT_DBBP_FLAG );
 #endif
@@ -244,5 +244,5 @@
       curCost += m_cSDCFlagSCModel.calcCost                    ( curSliceType, qp, (UChar*)INIT_SDC_FLAG );
 #endif                                                     
-#if H_3D_DBBP                                              
+#if NH_3D_DBBP
       curCost += m_cDBBPFlagSCModel.calcCost                   ( curSliceType, qp, (UChar*)INIT_DBBP_FLAG );
 #endif
@@ -321,7 +321,4 @@
   m_cSDCFlagSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_SDC_FLAG );
 #endif
-#if H_3D_DBBP
-  m_cDBBPFlagSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_DBBP_FLAG );
-#endif
 
 
@@ -2650,5 +2647,5 @@
 #endif
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 Void TEncSbac::codeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.h
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.h	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSbac.h	(revision 1222)
@@ -150,5 +150,5 @@
   Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void codeDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
@@ -262,5 +262,5 @@
   ContextModel3DBuffer m_cSDCFlagSCModel;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   ContextModel3DBuffer m_cDBBPFlagSCModel;
 #endif
Index: branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 1221)
+++ branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 1222)
@@ -3884,5 +3884,5 @@
   UInt uiDepth = pcCU->getDepth( uiAbsPartIdx );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   DbbpTmpData* pDBBPTmpData = pcCU->getDBBPTmpData();
   if( pcCU->getDBBPFlag(0) )
@@ -3891,5 +3891,5 @@
     AOF( iPUIdx == 0 );
     AOF( pcCU->getPartitionSize(0) == SIZE_2Nx2N );
-    AOF( pDBBPTmpData->eVirtualPartSize != SIZE_NONE );
+    AOF( pDBBPTmpData->eVirtualPartSize != NUMBER_OF_PART_SIZES );
     
     // temporary change of partition size for candidate derivation
@@ -3916,5 +3916,5 @@
 
   PartSize partSize = pcCU->getPartitionSize( 0 );
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && partSize != SIZE_2Nx2N && pcCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(0) == false )
 #else
@@ -3978,5 +3978,5 @@
   xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( pcCU->getDBBPFlag(0) )
   {
@@ -4025,5 +4025,5 @@
 #endif
 #if H_3D_VSP
-#if H_3D_DBBP
+#if NH_3D_DBBP
       if ( vspFlag[uiMergeCand] && !pcCU->getDBBPFlag(0) )
 #else
@@ -4550,5 +4550,5 @@
     } // end if bTestNormalMC
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
     // test merge mode for DBBP (2Nx2N)
     if ( pcCU->getPartitionSize( uiPartAddr ) != SIZE_2Nx2N || pcCU->getDBBPFlag(0) )
@@ -4649,5 +4649,5 @@
 #endif
 #if H_3D_VSP
-#if H_3D_DBBP
+#if NH_3D_DBBP
         if ( vspFlag[uiMRGIndex] && !pcCU->getDBBPFlag(uiPartAddr) )
 #else
@@ -4747,5 +4747,5 @@
   {
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
     DbbpTmpData* pDBBPTmpData = pcCU->getDBBPTmpData();
     if( pcCU->getDBBPFlag(0) )
@@ -4754,5 +4754,5 @@
       AOF( uiPartIdx == 0 );
       AOF( pcCU->getPartitionSize(0) == SIZE_2Nx2N );
-      AOF( pDBBPTmpData->eVirtualPartSize != SIZE_NONE );
+      AOF( pDBBPTmpData->eVirtualPartSize != NUMBER_OF_PART_SIZES );
       AOF( iRoiWidth == iRoiHeight );
       
@@ -4779,5 +4779,5 @@
 
     pcCU->fillMvpCand( uiPartIdx, uiPartAddr, eRefPicList, iRefIdx, pcAMVPInfo );
-#if H_3D_DBBP
+#if NH_3D_DBBP
     if( pcCU->getDBBPFlag(0) )
     {
@@ -7130,5 +7130,5 @@
     m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
 #endif
-#if H_3D
+#if NH_3D_DBBP
     m_pcEntropyCoder->encodeDBBPFlag( pcCU, 0, true );
 #endif
