shithub: openh264

Download patch

ref: be43cf888f62bae1a3f1e251e680a52ec3f1d62d
parent: d6e14c14da0e86390a4fd554a2dee2e1409fdca0
parent: fc056c7ef0315a2c6c9a07fc6c7df810335e0d24
author: volvet <[email protected]>
date: Tue Feb 25 10:31:00 EST 2014 

Merge pull request #354 from zhilwang/arm-asm

Refine structure of iOS project to fix the issue.

I will merge this pull request for it is to fix broken the iOS build.   please raise fix patch If exist any issue on the iOS makefile


--- a/codec/build/iOS/common/common.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/common/common.xcodeproj/project.pbxproj
@@ -14,11 +14,11 @@
 		4CE443ED18B722CD0017DF25 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D518B722CD0017DF25 /* libcommon.a */; };
 		4CE443F318B722CD0017DF25 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4CE443F118B722CD0017DF25 /* InfoPlist.strings */; };
 		4CE443F518B722CD0017DF25 /* commonTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE443F418B722CD0017DF25 /* commonTests.m */; };
-		4CE4441B18B722F00017DF25 /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4440018B722F00017DF25 /* cpu.cpp */; };
-		4CE4441D18B722F00017DF25 /* crt_util_safe_x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4440418B722F00017DF25 /* crt_util_safe_x.cpp */; };
-		4CE4441F18B722F00017DF25 /* deblocking_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4440718B722F00017DF25 /* deblocking_common.cpp */; };
-		4CE4442118B722F00017DF25 /* logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4440B18B722F00017DF25 /* logging.cpp */; };
-		4CE4442718B722F00017DF25 /* WelsThreadLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4441818B722F00017DF25 /* WelsThreadLib.cpp */; };
+		4CE4474C18BC61650017DF25 /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4473118BC61650017DF25 /* cpu.cpp */; };
+		4CE4474E18BC61650017DF25 /* crt_util_safe_x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4473518BC61650017DF25 /* crt_util_safe_x.cpp */; };
+		4CE4475018BC61650017DF25 /* deblocking_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4473818BC61650017DF25 /* deblocking_common.cpp */; };
+		4CE4475218BC61650017DF25 /* logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4473C18BC61650017DF25 /* logging.cpp */; };
+		4CE4475818BC61650017DF25 /* WelsThreadLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4474918BC61650017DF25 /* WelsThreadLib.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,7 +46,6 @@
 /* Begin PBXFileReference section */
 		4CE443D518B722CD0017DF25 /* libcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE443D818B722CD0017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		4CE443DC18B722CD0017DF25 /* common-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "common-Prefix.pch"; sourceTree = "<group>"; };
 		4CE443E518B722CD0017DF25 /* commonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = commonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE443E618B722CD0017DF25 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4CE443E918B722CD0017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -53,23 +52,23 @@
 		4CE443F018B722CD0017DF25 /* commonTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "commonTests-Info.plist"; sourceTree = "<group>"; };
 		4CE443F218B722CD0017DF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4CE443F418B722CD0017DF25 /* commonTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = commonTests.m; sourceTree = "<group>"; };
-		4CE4440018B722F00017DF25 /* cpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu.cpp; sourceTree = "<group>"; };
-		4CE4440118B722F00017DF25 /* cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu.h; sourceTree = "<group>"; };
-		4CE4440218B722F00017DF25 /* cpu_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu_core.h; sourceTree = "<group>"; };
-		4CE4440418B722F00017DF25 /* crt_util_safe_x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crt_util_safe_x.cpp; sourceTree = "<group>"; };
-		4CE4440518B722F00017DF25 /* crt_util_safe_x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crt_util_safe_x.h; sourceTree = "<group>"; };
-		4CE4440718B722F00017DF25 /* deblocking_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking_common.cpp; sourceTree = "<group>"; };
-		4CE4440818B722F00017DF25 /* deblocking_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking_common.h; sourceTree = "<group>"; };
-		4CE4440A18B722F00017DF25 /* expand_picture_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_picture_common.h; sourceTree = "<group>"; };
-		4CE4440B18B722F00017DF25 /* logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cpp; sourceTree = "<group>"; };
-		4CE4440C18B722F00017DF25 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = "<group>"; };
-		4CE4440D18B722F00017DF25 /* ls_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ls_defines.h; sourceTree = "<group>"; };
-		4CE4440E18B722F00017DF25 /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = "<group>"; };
-		4CE4441118B722F00017DF25 /* mc_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc_common.h; sourceTree = "<group>"; };
-		4CE4441318B722F00017DF25 /* measure_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = measure_time.h; sourceTree = "<group>"; };
-		4CE4441618B722F00017DF25 /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
-		4CE4441818B722F00017DF25 /* WelsThreadLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsThreadLib.cpp; sourceTree = "<group>"; };
-		4CE4441918B722F00017DF25 /* WelsThreadLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsThreadLib.h; sourceTree = "<group>"; };
+		4CE4473118BC61650017DF25 /* cpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu.cpp; sourceTree = "<group>"; };
+		4CE4473218BC61650017DF25 /* cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu.h; sourceTree = "<group>"; };
+		4CE4473318BC61650017DF25 /* cpu_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu_core.h; sourceTree = "<group>"; };
+		4CE4473518BC61650017DF25 /* crt_util_safe_x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crt_util_safe_x.cpp; sourceTree = "<group>"; };
+		4CE4473618BC61650017DF25 /* crt_util_safe_x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crt_util_safe_x.h; sourceTree = "<group>"; };
+		4CE4473818BC61650017DF25 /* deblocking_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking_common.cpp; sourceTree = "<group>"; };
+		4CE4473918BC61650017DF25 /* deblocking_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking_common.h; sourceTree = "<group>"; };
+		4CE4473B18BC61650017DF25 /* expand_picture_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_picture_common.h; sourceTree = "<group>"; };
+		4CE4473C18BC61650017DF25 /* logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cpp; sourceTree = "<group>"; };
+		4CE4473D18BC61650017DF25 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = "<group>"; };
+		4CE4473E18BC61650017DF25 /* ls_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ls_defines.h; sourceTree = "<group>"; };
+		4CE4473F18BC61650017DF25 /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = "<group>"; };
+		4CE4474218BC61650017DF25 /* mc_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc_common.h; sourceTree = "<group>"; };
+		4CE4474418BC61650017DF25 /* measure_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = measure_time.h; sourceTree = "<group>"; };
+		4CE4474718BC61650017DF25 /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
+		4CE4474918BC61650017DF25 /* WelsThreadLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsThreadLib.cpp; sourceTree = "<group>"; };
+		4CE4474A18BC61650017DF25 /* WelsThreadLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsThreadLib.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -98,7 +97,7 @@
 		4CE443CC18B722CC0017DF25 = {
 			isa = PBXGroup;
 			children = (
-				4CE443DA18B722CD0017DF25 /* common */,
+				4CE4472F18BC61650017DF25 /* common */,
 				4CE443EE18B722CD0017DF25 /* commonTests */,
 				4CE443D718B722CD0017DF25 /* Frameworks */,
 				4CE443D618B722CD0017DF25 /* Products */,
@@ -124,23 +123,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4CE443DA18B722CD0017DF25 /* common */ = {
-			isa = PBXGroup;
-			children = (
-				4CE443FE18B722F00017DF25 /* common */,
-				4CE443DB18B722CD0017DF25 /* Supporting Files */,
-			);
-			path = common;
-			sourceTree = "<group>";
-		};
-		4CE443DB18B722CD0017DF25 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				4CE443DC18B722CD0017DF25 /* common-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		4CE443EE18B722CD0017DF25 /* commonTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -159,29 +141,29 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		4CE443FE18B722F00017DF25 /* common */ = {
+		4CE4472F18BC61650017DF25 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4440018B722F00017DF25 /* cpu.cpp */,
-				4CE4440118B722F00017DF25 /* cpu.h */,
-				4CE4440218B722F00017DF25 /* cpu_core.h */,
-				4CE4440418B722F00017DF25 /* crt_util_safe_x.cpp */,
-				4CE4440518B722F00017DF25 /* crt_util_safe_x.h */,
-				4CE4440718B722F00017DF25 /* deblocking_common.cpp */,
-				4CE4440818B722F00017DF25 /* deblocking_common.h */,
-				4CE4440A18B722F00017DF25 /* expand_picture_common.h */,
-				4CE4440B18B722F00017DF25 /* logging.cpp */,
-				4CE4440C18B722F00017DF25 /* logging.h */,
-				4CE4440D18B722F00017DF25 /* ls_defines.h */,
-				4CE4440E18B722F00017DF25 /* macros.h */,
-				4CE4441118B722F00017DF25 /* mc_common.h */,
-				4CE4441318B722F00017DF25 /* measure_time.h */,
-				4CE4441618B722F00017DF25 /* typedefs.h */,
-				4CE4441818B722F00017DF25 /* WelsThreadLib.cpp */,
-				4CE4441918B722F00017DF25 /* WelsThreadLib.h */,
+				4CE4473118BC61650017DF25 /* cpu.cpp */,
+				4CE4473218BC61650017DF25 /* cpu.h */,
+				4CE4473318BC61650017DF25 /* cpu_core.h */,
+				4CE4473518BC61650017DF25 /* crt_util_safe_x.cpp */,
+				4CE4473618BC61650017DF25 /* crt_util_safe_x.h */,
+				4CE4473818BC61650017DF25 /* deblocking_common.cpp */,
+				4CE4473918BC61650017DF25 /* deblocking_common.h */,
+				4CE4473B18BC61650017DF25 /* expand_picture_common.h */,
+				4CE4473C18BC61650017DF25 /* logging.cpp */,
+				4CE4473D18BC61650017DF25 /* logging.h */,
+				4CE4473E18BC61650017DF25 /* ls_defines.h */,
+				4CE4473F18BC61650017DF25 /* macros.h */,
+				4CE4474218BC61650017DF25 /* mc_common.h */,
+				4CE4474418BC61650017DF25 /* measure_time.h */,
+				4CE4474718BC61650017DF25 /* typedefs.h */,
+				4CE4474918BC61650017DF25 /* WelsThreadLib.cpp */,
+				4CE4474A18BC61650017DF25 /* WelsThreadLib.h */,
 			);
 			name = common;
-			path = ../../../../common;
+			path = ../../../common;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -265,11 +247,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CE4441F18B722F00017DF25 /* deblocking_common.cpp in Sources */,
-				4CE4441B18B722F00017DF25 /* cpu.cpp in Sources */,
-				4CE4442118B722F00017DF25 /* logging.cpp in Sources */,
-				4CE4442718B722F00017DF25 /* WelsThreadLib.cpp in Sources */,
-				4CE4441D18B722F00017DF25 /* crt_util_safe_x.cpp in Sources */,
+				4CE4475018BC61650017DF25 /* deblocking_common.cpp in Sources */,
+				4CE4474C18BC61650017DF25 /* cpu.cpp in Sources */,
+				4CE4475218BC61650017DF25 /* logging.cpp in Sources */,
+				4CE4475818BC61650017DF25 /* WelsThreadLib.cpp in Sources */,
+				4CE4474E18BC61650017DF25 /* crt_util_safe_x.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -475,6 +457,7 @@
 				4CE443FA18B722CD0017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		4CE443FB18B722CD0017DF25 /* Build configuration list for PBXNativeTarget "commonTests" */ = {
 			isa = XCConfigurationList;
@@ -483,6 +466,7 @@
 				4CE443FD18B722CD0017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
--- a/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj
@@ -68,7 +68,6 @@
 		F0E663511810EFA5000C888E /* demo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "demo-Info.plist"; sourceTree = "<group>"; };
 		F0E663531810EFA5000C888E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F0E663551810EFA5000C888E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		F0E663571810EFA5000C888E /* demo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "demo-Prefix.pch"; sourceTree = "<group>"; };
 		F0E663581810EFA5000C888E /* DEMOAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DEMOAppDelegate.h; sourceTree = "<group>"; };
 		F0E663591810EFA5000C888E /* DEMOAppDelegate.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; path = DEMOAppDelegate.m; sourceTree = "<group>"; };
 		F0E6635B1810EFA5000C888E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
@@ -173,7 +172,6 @@
 				F0E663511810EFA5000C888E /* demo-Info.plist */,
 				F0E663521810EFA5000C888E /* InfoPlist.strings */,
 				F0E663551810EFA5000C888E /* main.m */,
-				F0E663571810EFA5000C888E /* demo-Prefix.pch */,
 				F0E6635B1810EFA5000C888E /* Default.png */,
 				F0E6635D1810EFA5000C888E /* [email protected] */,
 				F0E6635F1810EFA5000C888E /* [email protected] */,
--- a/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj
@@ -14,28 +14,28 @@
 		4CE4429118B6FC360017DF25 /* libwelsdec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE4427918B6FC360017DF25 /* libwelsdec.a */; };
 		4CE4429718B6FC360017DF25 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4CE4429518B6FC360017DF25 /* InfoPlist.strings */; };
 		4CE4429918B6FC360017DF25 /* welsdecTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4429818B6FC360017DF25 /* welsdecTests.m */; };
-		4CE442EC18B6FC590017DF25 /* au_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CA18B6FC590017DF25 /* au_parser.cpp */; };
-		4CE442ED18B6FC590017DF25 /* bit_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CB18B6FC590017DF25 /* bit_stream.cpp */; };
-		4CE442EE18B6FC590017DF25 /* deblocking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CC18B6FC590017DF25 /* deblocking.cpp */; };
-		4CE442EF18B6FC590017DF25 /* decode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CD18B6FC590017DF25 /* decode_mb_aux.cpp */; };
-		4CE442F018B6FC590017DF25 /* decode_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CE18B6FC590017DF25 /* decode_slice.cpp */; };
-		4CE442F118B6FC590017DF25 /* decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442CF18B6FC590017DF25 /* decoder.cpp */; };
-		4CE442F218B6FC590017DF25 /* decoder_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D018B6FC590017DF25 /* decoder_core.cpp */; };
-		4CE442F318B6FC590017DF25 /* decoder_data_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D118B6FC590017DF25 /* decoder_data_tables.cpp */; };
-		4CE442F418B6FC590017DF25 /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D218B6FC590017DF25 /* expand_pic.cpp */; };
-		4CE442F518B6FC590017DF25 /* fmo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D318B6FC590017DF25 /* fmo.cpp */; };
-		4CE442F618B6FC590017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D418B6FC590017DF25 /* get_intra_predictor.cpp */; };
-		4CE442F718B6FC590017DF25 /* manage_dec_ref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D518B6FC590017DF25 /* manage_dec_ref.cpp */; };
-		4CE442F818B6FC590017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D618B6FC590017DF25 /* mc.cpp */; };
-		4CE442F918B6FC590017DF25 /* mem_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D718B6FC590017DF25 /* mem_align.cpp */; };
-		4CE442FA18B6FC590017DF25 /* memmgr_nal_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D818B6FC590017DF25 /* memmgr_nal_unit.cpp */; };
-		4CE442FB18B6FC590017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442D918B6FC590017DF25 /* mv_pred.cpp */; };
-		4CE442FC18B6FC590017DF25 /* parse_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442DA18B6FC590017DF25 /* parse_mb_syn_cavlc.cpp */; };
-		4CE442FD18B6FC590017DF25 /* pic_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442DB18B6FC590017DF25 /* pic_queue.cpp */; };
-		4CE442FE18B6FC590017DF25 /* rec_mb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442DC18B6FC590017DF25 /* rec_mb.cpp */; };
-		4CE442FF18B6FC590017DF25 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442DD18B6FC590017DF25 /* utils.cpp */; };
-		4CE4430018B6FC590017DF25 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442E718B6FC590017DF25 /* welsCodecTrace.cpp */; };
-		4CE4430118B6FC590017DF25 /* welsDecoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE442E818B6FC590017DF25 /* welsDecoderExt.cpp */; };
+		4CE4468A18BC5EAB0017DF25 /* au_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466718BC5EAA0017DF25 /* au_parser.cpp */; };
+		4CE4468B18BC5EAB0017DF25 /* bit_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466818BC5EAA0017DF25 /* bit_stream.cpp */; };
+		4CE4468C18BC5EAB0017DF25 /* deblocking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466918BC5EAA0017DF25 /* deblocking.cpp */; };
+		4CE4468D18BC5EAB0017DF25 /* decode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466A18BC5EAA0017DF25 /* decode_mb_aux.cpp */; };
+		4CE4468E18BC5EAB0017DF25 /* decode_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466B18BC5EAA0017DF25 /* decode_slice.cpp */; };
+		4CE4468F18BC5EAB0017DF25 /* decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466C18BC5EAA0017DF25 /* decoder.cpp */; };
+		4CE4469018BC5EAB0017DF25 /* decoder_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466D18BC5EAA0017DF25 /* decoder_core.cpp */; };
+		4CE4469118BC5EAB0017DF25 /* decoder_data_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466E18BC5EAA0017DF25 /* decoder_data_tables.cpp */; };
+		4CE4469218BC5EAB0017DF25 /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4466F18BC5EAA0017DF25 /* expand_pic.cpp */; };
+		4CE4469318BC5EAB0017DF25 /* fmo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467018BC5EAA0017DF25 /* fmo.cpp */; };
+		4CE4469418BC5EAB0017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */; };
+		4CE4469518BC5EAB0017DF25 /* manage_dec_ref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */; };
+		4CE4469618BC5EAB0017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467318BC5EAA0017DF25 /* mc.cpp */; };
+		4CE4469718BC5EAB0017DF25 /* mem_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467418BC5EAA0017DF25 /* mem_align.cpp */; };
+		4CE4469818BC5EAB0017DF25 /* memmgr_nal_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */; };
+		4CE4469918BC5EAB0017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */; };
+		4CE4469A18BC5EAB0017DF25 /* parse_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */; };
+		4CE4469B18BC5EAB0017DF25 /* pic_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467818BC5EAA0017DF25 /* pic_queue.cpp */; };
+		4CE4469C18BC5EAB0017DF25 /* rec_mb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467918BC5EAA0017DF25 /* rec_mb.cpp */; };
+		4CE4469D18BC5EAB0017DF25 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467A18BC5EAA0017DF25 /* utils.cpp */; };
+		4CE4469E18BC5EAB0017DF25 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4468418BC5EAB0017DF25 /* welsCodecTrace.cpp */; };
+		4CE4469F18BC5EAB0017DF25 /* welsDecoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4468518BC5EAB0017DF25 /* welsDecoderExt.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -63,7 +63,6 @@
 /* Begin PBXFileReference section */
 		4CE4427918B6FC360017DF25 /* libwelsdec.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwelsdec.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4427C18B6FC360017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		4CE4428018B6FC360017DF25 /* welsdec-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "welsdec-Prefix.pch"; sourceTree = "<group>"; };
 		4CE4428918B6FC360017DF25 /* welsdecTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = welsdecTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4428A18B6FC360017DF25 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4CE4428D18B6FC360017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -70,67 +69,64 @@
 		4CE4429418B6FC360017DF25 /* welsdecTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "welsdecTests-Info.plist"; sourceTree = "<group>"; };
 		4CE4429618B6FC360017DF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4CE4429818B6FC360017DF25 /* welsdecTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = welsdecTests.m; sourceTree = "<group>"; };
-		4CE442A818B6FC590017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
-		4CE442A918B6FC590017DF25 /* au_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_parser.h; sourceTree = "<group>"; };
-		4CE442AA18B6FC590017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
-		4CE442AB18B6FC590017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
-		4CE442AC18B6FC590017DF25 /* dec_frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dec_frame.h; sourceTree = "<group>"; };
-		4CE442AD18B6FC590017DF25 /* dec_golomb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dec_golomb.h; sourceTree = "<group>"; };
-		4CE442AE18B6FC590017DF25 /* decode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_mb_aux.h; sourceTree = "<group>"; };
-		4CE442AF18B6FC590017DF25 /* decode_slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_slice.h; sourceTree = "<group>"; };
-		4CE442B018B6FC590017DF25 /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = "<group>"; };
-		4CE442B118B6FC590017DF25 /* decoder_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder_context.h; sourceTree = "<group>"; };
-		4CE442B218B6FC590017DF25 /* decoder_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder_core.h; sourceTree = "<group>"; };
-		4CE442B318B6FC590017DF25 /* error_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error_code.h; sourceTree = "<group>"; };
-		4CE442B418B6FC590017DF25 /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_pic.h; sourceTree = "<group>"; };
-		4CE442B518B6FC590017DF25 /* fmo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmo.h; sourceTree = "<group>"; };
-		4CE442B618B6FC590017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; };
-		4CE442B718B6FC590017DF25 /* manage_dec_ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = manage_dec_ref.h; sourceTree = "<group>"; };
-		4CE442B818B6FC590017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
-		4CE442B918B6FC590017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
-		4CE442BA18B6FC590017DF25 /* mem_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem_align.h; sourceTree = "<group>"; };
-		4CE442BB18B6FC590017DF25 /* memmgr_nal_unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memmgr_nal_unit.h; sourceTree = "<group>"; };
-		4CE442BC18B6FC590017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
-		4CE442BD18B6FC590017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
-		4CE442BE18B6FC590017DF25 /* nalu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nalu.h; sourceTree = "<group>"; };
-		4CE442BF18B6FC590017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; };
-		4CE442C018B6FC590017DF25 /* parse_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse_mb_syn_cavlc.h; sourceTree = "<group>"; };
-		4CE442C118B6FC590017DF25 /* pic_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pic_queue.h; sourceTree = "<group>"; };
-		4CE442C218B6FC590017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
-		4CE442C318B6FC590017DF25 /* rec_mb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rec_mb.h; sourceTree = "<group>"; };
-		4CE442C418B6FC590017DF25 /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; };
-		4CE442C518B6FC590017DF25 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		4CE442C618B6FC590017DF25 /* vlc_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc_decoder.h; sourceTree = "<group>"; };
-		4CE442C718B6FC590017DF25 /* wels_common_basis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_common_basis.h; sourceTree = "<group>"; };
-		4CE442C818B6FC590017DF25 /* wels_const.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_const.h; sourceTree = "<group>"; };
-		4CE442CA18B6FC590017DF25 /* au_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = au_parser.cpp; sourceTree = "<group>"; };
-		4CE442CB18B6FC590017DF25 /* bit_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bit_stream.cpp; sourceTree = "<group>"; };
-		4CE442CC18B6FC590017DF25 /* deblocking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking.cpp; sourceTree = "<group>"; };
-		4CE442CD18B6FC590017DF25 /* decode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_mb_aux.cpp; sourceTree = "<group>"; };
-		4CE442CE18B6FC590017DF25 /* decode_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_slice.cpp; sourceTree = "<group>"; };
-		4CE442CF18B6FC590017DF25 /* decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder.cpp; sourceTree = "<group>"; };
-		4CE442D018B6FC590017DF25 /* decoder_core.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder_core.cpp; sourceTree = "<group>"; };
-		4CE442D118B6FC590017DF25 /* decoder_data_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder_data_tables.cpp; sourceTree = "<group>"; };
-		4CE442D218B6FC590017DF25 /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expand_pic.cpp; sourceTree = "<group>"; };
-		4CE442D318B6FC590017DF25 /* fmo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmo.cpp; sourceTree = "<group>"; };
-		4CE442D418B6FC590017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
-		4CE442D518B6FC590017DF25 /* manage_dec_ref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manage_dec_ref.cpp; sourceTree = "<group>"; };
-		4CE442D618B6FC590017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
-		4CE442D718B6FC590017DF25 /* mem_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mem_align.cpp; sourceTree = "<group>"; };
-		4CE442D818B6FC590017DF25 /* memmgr_nal_unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memmgr_nal_unit.cpp; sourceTree = "<group>"; };
-		4CE442D918B6FC590017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
-		4CE442DA18B6FC590017DF25 /* parse_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parse_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
-		4CE442DB18B6FC590017DF25 /* pic_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pic_queue.cpp; sourceTree = "<group>"; };
-		4CE442DC18B6FC590017DF25 /* rec_mb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rec_mb.cpp; sourceTree = "<group>"; };
-		4CE442DD18B6FC590017DF25 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
-		4CE442E018B6FC590017DF25 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsCodecTrace.h; sourceTree = "<group>"; };
-		4CE442E118B6FC590017DF25 /* welsDecoderExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsDecoderExt.h; sourceTree = "<group>"; };
-		4CE442E618B6FC590017DF25 /* wels_dec_export.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wels_dec_export.def; sourceTree = "<group>"; };
-		4CE442E718B6FC590017DF25 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsCodecTrace.cpp; sourceTree = "<group>"; };
-		4CE442E818B6FC590017DF25 /* welsDecoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsDecoderExt.cpp; sourceTree = "<group>"; };
-		4CE4430318B6FC660017DF25 /* codec_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_api.h; sourceTree = "<group>"; };
-		4CE4430418B6FC660017DF25 /* codec_app_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_app_def.h; sourceTree = "<group>"; };
-		4CE4430518B6FC660017DF25 /* codec_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_def.h; sourceTree = "<group>"; };
+		4CE4464518BC5EAA0017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
+		4CE4464618BC5EAA0017DF25 /* au_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_parser.h; sourceTree = "<group>"; };
+		4CE4464718BC5EAA0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
+		4CE4464818BC5EAA0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
+		4CE4464918BC5EAA0017DF25 /* dec_frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dec_frame.h; sourceTree = "<group>"; };
+		4CE4464A18BC5EAA0017DF25 /* dec_golomb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dec_golomb.h; sourceTree = "<group>"; };
+		4CE4464B18BC5EAA0017DF25 /* decode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_mb_aux.h; sourceTree = "<group>"; };
+		4CE4464C18BC5EAA0017DF25 /* decode_slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_slice.h; sourceTree = "<group>"; };
+		4CE4464D18BC5EAA0017DF25 /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = "<group>"; };
+		4CE4464E18BC5EAA0017DF25 /* decoder_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder_context.h; sourceTree = "<group>"; };
+		4CE4464F18BC5EAA0017DF25 /* decoder_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder_core.h; sourceTree = "<group>"; };
+		4CE4465018BC5EAA0017DF25 /* error_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error_code.h; sourceTree = "<group>"; };
+		4CE4465118BC5EAA0017DF25 /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_pic.h; sourceTree = "<group>"; };
+		4CE4465218BC5EAA0017DF25 /* fmo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmo.h; sourceTree = "<group>"; };
+		4CE4465318BC5EAA0017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; };
+		4CE4465418BC5EAA0017DF25 /* manage_dec_ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = manage_dec_ref.h; sourceTree = "<group>"; };
+		4CE4465518BC5EAA0017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
+		4CE4465618BC5EAA0017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
+		4CE4465718BC5EAA0017DF25 /* mem_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem_align.h; sourceTree = "<group>"; };
+		4CE4465818BC5EAA0017DF25 /* memmgr_nal_unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memmgr_nal_unit.h; sourceTree = "<group>"; };
+		4CE4465918BC5EAA0017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
+		4CE4465A18BC5EAA0017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
+		4CE4465B18BC5EAA0017DF25 /* nalu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nalu.h; sourceTree = "<group>"; };
+		4CE4465C18BC5EAA0017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; };
+		4CE4465D18BC5EAA0017DF25 /* parse_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse_mb_syn_cavlc.h; sourceTree = "<group>"; };
+		4CE4465E18BC5EAA0017DF25 /* pic_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pic_queue.h; sourceTree = "<group>"; };
+		4CE4465F18BC5EAA0017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
+		4CE4466018BC5EAA0017DF25 /* rec_mb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rec_mb.h; sourceTree = "<group>"; };
+		4CE4466118BC5EAA0017DF25 /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; };
+		4CE4466218BC5EAA0017DF25 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		4CE4466318BC5EAA0017DF25 /* vlc_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc_decoder.h; sourceTree = "<group>"; };
+		4CE4466418BC5EAA0017DF25 /* wels_common_basis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_common_basis.h; sourceTree = "<group>"; };
+		4CE4466518BC5EAA0017DF25 /* wels_const.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_const.h; sourceTree = "<group>"; };
+		4CE4466718BC5EAA0017DF25 /* au_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = au_parser.cpp; sourceTree = "<group>"; };
+		4CE4466818BC5EAA0017DF25 /* bit_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bit_stream.cpp; sourceTree = "<group>"; };
+		4CE4466918BC5EAA0017DF25 /* deblocking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking.cpp; sourceTree = "<group>"; };
+		4CE4466A18BC5EAA0017DF25 /* decode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_mb_aux.cpp; sourceTree = "<group>"; };
+		4CE4466B18BC5EAA0017DF25 /* decode_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_slice.cpp; sourceTree = "<group>"; };
+		4CE4466C18BC5EAA0017DF25 /* decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder.cpp; sourceTree = "<group>"; };
+		4CE4466D18BC5EAA0017DF25 /* decoder_core.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder_core.cpp; sourceTree = "<group>"; };
+		4CE4466E18BC5EAA0017DF25 /* decoder_data_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder_data_tables.cpp; sourceTree = "<group>"; };
+		4CE4466F18BC5EAA0017DF25 /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expand_pic.cpp; sourceTree = "<group>"; };
+		4CE4467018BC5EAA0017DF25 /* fmo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmo.cpp; sourceTree = "<group>"; };
+		4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
+		4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manage_dec_ref.cpp; sourceTree = "<group>"; };
+		4CE4467318BC5EAA0017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
+		4CE4467418BC5EAA0017DF25 /* mem_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mem_align.cpp; sourceTree = "<group>"; };
+		4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memmgr_nal_unit.cpp; sourceTree = "<group>"; };
+		4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
+		4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parse_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
+		4CE4467818BC5EAA0017DF25 /* pic_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pic_queue.cpp; sourceTree = "<group>"; };
+		4CE4467918BC5EAA0017DF25 /* rec_mb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rec_mb.cpp; sourceTree = "<group>"; };
+		4CE4467A18BC5EAA0017DF25 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
+		4CE4467D18BC5EAA0017DF25 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsCodecTrace.h; sourceTree = "<group>"; };
+		4CE4467E18BC5EAA0017DF25 /* welsDecoderExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsDecoderExt.h; sourceTree = "<group>"; };
+		4CE4468318BC5EAB0017DF25 /* wels_dec_export.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wels_dec_export.def; sourceTree = "<group>"; };
+		4CE4468418BC5EAB0017DF25 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsCodecTrace.cpp; sourceTree = "<group>"; };
+		4CE4468518BC5EAB0017DF25 /* welsDecoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsDecoderExt.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -159,7 +155,7 @@
 		4CE4427018B6FC360017DF25 = {
 			isa = PBXGroup;
 			children = (
-				4CE4427E18B6FC360017DF25 /* welsdec */,
+				4CE4463E18BC5EAA0017DF25 /* decoder */,
 				4CE4429218B6FC360017DF25 /* welsdecTests */,
 				4CE4427B18B6FC360017DF25 /* Frameworks */,
 				4CE4427A18B6FC360017DF25 /* Products */,
@@ -185,25 +181,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4CE4427E18B6FC360017DF25 /* welsdec */ = {
-			isa = PBXGroup;
-			children = (
-				4CE4430218B6FC660017DF25 /* svc */,
-				4CE442A218B6FC590017DF25 /* core */,
-				4CE442DE18B6FC590017DF25 /* plus */,
-				4CE4427F18B6FC360017DF25 /* Supporting Files */,
-			);
-			path = welsdec;
-			sourceTree = "<group>";
-		};
-		4CE4427F18B6FC360017DF25 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				4CE4428018B6FC360017DF25 /* welsdec-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		4CE4429218B6FC360017DF25 /* welsdecTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -222,121 +199,118 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		4CE442A218B6FC590017DF25 /* core */ = {
+		4CE4463E18BC5EAA0017DF25 /* decoder */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442A718B6FC590017DF25 /* inc */,
-				4CE442C918B6FC590017DF25 /* src */,
+				4CE4463F18BC5EAA0017DF25 /* core */,
+				4CE4467B18BC5EAA0017DF25 /* plus */,
 			);
-			name = core;
-			path = ../../../../../decoder/core;
+			name = decoder;
+			path = ../../../../decoder;
 			sourceTree = "<group>";
 		};
-		4CE442A718B6FC590017DF25 /* inc */ = {
+		4CE4463F18BC5EAA0017DF25 /* core */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442A818B6FC590017DF25 /* as264_common.h */,
-				4CE442A918B6FC590017DF25 /* au_parser.h */,
-				4CE442AA18B6FC590017DF25 /* bit_stream.h */,
-				4CE442AB18B6FC590017DF25 /* deblocking.h */,
-				4CE442AC18B6FC590017DF25 /* dec_frame.h */,
-				4CE442AD18B6FC590017DF25 /* dec_golomb.h */,
-				4CE442AE18B6FC590017DF25 /* decode_mb_aux.h */,
-				4CE442AF18B6FC590017DF25 /* decode_slice.h */,
-				4CE442B018B6FC590017DF25 /* decoder.h */,
-				4CE442B118B6FC590017DF25 /* decoder_context.h */,
-				4CE442B218B6FC590017DF25 /* decoder_core.h */,
-				4CE442B318B6FC590017DF25 /* error_code.h */,
-				4CE442B418B6FC590017DF25 /* expand_pic.h */,
-				4CE442B518B6FC590017DF25 /* fmo.h */,
-				4CE442B618B6FC590017DF25 /* get_intra_predictor.h */,
-				4CE442B718B6FC590017DF25 /* manage_dec_ref.h */,
-				4CE442B818B6FC590017DF25 /* mb_cache.h */,
-				4CE442B918B6FC590017DF25 /* mc.h */,
-				4CE442BA18B6FC590017DF25 /* mem_align.h */,
-				4CE442BB18B6FC590017DF25 /* memmgr_nal_unit.h */,
-				4CE442BC18B6FC590017DF25 /* mv_pred.h */,
-				4CE442BD18B6FC590017DF25 /* nal_prefix.h */,
-				4CE442BE18B6FC590017DF25 /* nalu.h */,
-				4CE442BF18B6FC590017DF25 /* parameter_sets.h */,
-				4CE442C018B6FC590017DF25 /* parse_mb_syn_cavlc.h */,
-				4CE442C118B6FC590017DF25 /* pic_queue.h */,
-				4CE442C218B6FC590017DF25 /* picture.h */,
-				4CE442C318B6FC590017DF25 /* rec_mb.h */,
-				4CE442C418B6FC590017DF25 /* slice.h */,
-				4CE442C518B6FC590017DF25 /* utils.h */,
-				4CE442C618B6FC590017DF25 /* vlc_decoder.h */,
-				4CE442C718B6FC590017DF25 /* wels_common_basis.h */,
-				4CE442C818B6FC590017DF25 /* wels_const.h */,
+				4CE4464418BC5EAA0017DF25 /* inc */,
+				4CE4466618BC5EAA0017DF25 /* src */,
 			);
-			path = inc;
+			path = core;
 			sourceTree = "<group>";
 		};
-		4CE442C918B6FC590017DF25 /* src */ = {
+		4CE4464418BC5EAA0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442CA18B6FC590017DF25 /* au_parser.cpp */,
-				4CE442CB18B6FC590017DF25 /* bit_stream.cpp */,
-				4CE442CC18B6FC590017DF25 /* deblocking.cpp */,
-				4CE442CD18B6FC590017DF25 /* decode_mb_aux.cpp */,
-				4CE442CE18B6FC590017DF25 /* decode_slice.cpp */,
-				4CE442CF18B6FC590017DF25 /* decoder.cpp */,
-				4CE442D018B6FC590017DF25 /* decoder_core.cpp */,
-				4CE442D118B6FC590017DF25 /* decoder_data_tables.cpp */,
-				4CE442D218B6FC590017DF25 /* expand_pic.cpp */,
-				4CE442D318B6FC590017DF25 /* fmo.cpp */,
-				4CE442D418B6FC590017DF25 /* get_intra_predictor.cpp */,
-				4CE442D518B6FC590017DF25 /* manage_dec_ref.cpp */,
-				4CE442D618B6FC590017DF25 /* mc.cpp */,
-				4CE442D718B6FC590017DF25 /* mem_align.cpp */,
-				4CE442D818B6FC590017DF25 /* memmgr_nal_unit.cpp */,
-				4CE442D918B6FC590017DF25 /* mv_pred.cpp */,
-				4CE442DA18B6FC590017DF25 /* parse_mb_syn_cavlc.cpp */,
-				4CE442DB18B6FC590017DF25 /* pic_queue.cpp */,
-				4CE442DC18B6FC590017DF25 /* rec_mb.cpp */,
-				4CE442DD18B6FC590017DF25 /* utils.cpp */,
+				4CE4464518BC5EAA0017DF25 /* as264_common.h */,
+				4CE4464618BC5EAA0017DF25 /* au_parser.h */,
+				4CE4464718BC5EAA0017DF25 /* bit_stream.h */,
+				4CE4464818BC5EAA0017DF25 /* deblocking.h */,
+				4CE4464918BC5EAA0017DF25 /* dec_frame.h */,
+				4CE4464A18BC5EAA0017DF25 /* dec_golomb.h */,
+				4CE4464B18BC5EAA0017DF25 /* decode_mb_aux.h */,
+				4CE4464C18BC5EAA0017DF25 /* decode_slice.h */,
+				4CE4464D18BC5EAA0017DF25 /* decoder.h */,
+				4CE4464E18BC5EAA0017DF25 /* decoder_context.h */,
+				4CE4464F18BC5EAA0017DF25 /* decoder_core.h */,
+				4CE4465018BC5EAA0017DF25 /* error_code.h */,
+				4CE4465118BC5EAA0017DF25 /* expand_pic.h */,
+				4CE4465218BC5EAA0017DF25 /* fmo.h */,
+				4CE4465318BC5EAA0017DF25 /* get_intra_predictor.h */,
+				4CE4465418BC5EAA0017DF25 /* manage_dec_ref.h */,
+				4CE4465518BC5EAA0017DF25 /* mb_cache.h */,
+				4CE4465618BC5EAA0017DF25 /* mc.h */,
+				4CE4465718BC5EAA0017DF25 /* mem_align.h */,
+				4CE4465818BC5EAA0017DF25 /* memmgr_nal_unit.h */,
+				4CE4465918BC5EAA0017DF25 /* mv_pred.h */,
+				4CE4465A18BC5EAA0017DF25 /* nal_prefix.h */,
+				4CE4465B18BC5EAA0017DF25 /* nalu.h */,
+				4CE4465C18BC5EAA0017DF25 /* parameter_sets.h */,
+				4CE4465D18BC5EAA0017DF25 /* parse_mb_syn_cavlc.h */,
+				4CE4465E18BC5EAA0017DF25 /* pic_queue.h */,
+				4CE4465F18BC5EAA0017DF25 /* picture.h */,
+				4CE4466018BC5EAA0017DF25 /* rec_mb.h */,
+				4CE4466118BC5EAA0017DF25 /* slice.h */,
+				4CE4466218BC5EAA0017DF25 /* utils.h */,
+				4CE4466318BC5EAA0017DF25 /* vlc_decoder.h */,
+				4CE4466418BC5EAA0017DF25 /* wels_common_basis.h */,
+				4CE4466518BC5EAA0017DF25 /* wels_const.h */,
 			);
-			path = src;
+			path = inc;
 			sourceTree = "<group>";
 		};
-		4CE442DE18B6FC590017DF25 /* plus */ = {
+		4CE4466618BC5EAA0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442DF18B6FC590017DF25 /* inc */,
-				4CE442E518B6FC590017DF25 /* src */,
+				4CE4466718BC5EAA0017DF25 /* au_parser.cpp */,
+				4CE4466818BC5EAA0017DF25 /* bit_stream.cpp */,
+				4CE4466918BC5EAA0017DF25 /* deblocking.cpp */,
+				4CE4466A18BC5EAA0017DF25 /* decode_mb_aux.cpp */,
+				4CE4466B18BC5EAA0017DF25 /* decode_slice.cpp */,
+				4CE4466C18BC5EAA0017DF25 /* decoder.cpp */,
+				4CE4466D18BC5EAA0017DF25 /* decoder_core.cpp */,
+				4CE4466E18BC5EAA0017DF25 /* decoder_data_tables.cpp */,
+				4CE4466F18BC5EAA0017DF25 /* expand_pic.cpp */,
+				4CE4467018BC5EAA0017DF25 /* fmo.cpp */,
+				4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */,
+				4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */,
+				4CE4467318BC5EAA0017DF25 /* mc.cpp */,
+				4CE4467418BC5EAA0017DF25 /* mem_align.cpp */,
+				4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */,
+				4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */,
+				4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */,
+				4CE4467818BC5EAA0017DF25 /* pic_queue.cpp */,
+				4CE4467918BC5EAA0017DF25 /* rec_mb.cpp */,
+				4CE4467A18BC5EAA0017DF25 /* utils.cpp */,
 			);
-			name = plus;
-			path = ../../../../../decoder/plus;
+			path = src;
 			sourceTree = "<group>";
 		};
-		4CE442DF18B6FC590017DF25 /* inc */ = {
+		4CE4467B18BC5EAA0017DF25 /* plus */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442E018B6FC590017DF25 /* welsCodecTrace.h */,
-				4CE442E118B6FC590017DF25 /* welsDecoderExt.h */,
+				4CE4467C18BC5EAA0017DF25 /* inc */,
+				4CE4468218BC5EAB0017DF25 /* src */,
 			);
-			path = inc;
+			path = plus;
 			sourceTree = "<group>";
 		};
-		4CE442E518B6FC590017DF25 /* src */ = {
+		4CE4467C18BC5EAA0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				4CE442E618B6FC590017DF25 /* wels_dec_export.def */,
-				4CE442E718B6FC590017DF25 /* welsCodecTrace.cpp */,
-				4CE442E818B6FC590017DF25 /* welsDecoderExt.cpp */,
+				4CE4467D18BC5EAA0017DF25 /* welsCodecTrace.h */,
+				4CE4467E18BC5EAA0017DF25 /* welsDecoderExt.h */,
 			);
-			path = src;
+			path = inc;
 			sourceTree = "<group>";
 		};
-		4CE4430218B6FC660017DF25 /* svc */ = {
+		4CE4468218BC5EAB0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4430318B6FC660017DF25 /* codec_api.h */,
-				4CE4430418B6FC660017DF25 /* codec_app_def.h */,
-				4CE4430518B6FC660017DF25 /* codec_def.h */,
+				4CE4468318BC5EAB0017DF25 /* wels_dec_export.def */,
+				4CE4468418BC5EAB0017DF25 /* welsCodecTrace.cpp */,
+				4CE4468518BC5EAB0017DF25 /* welsDecoderExt.cpp */,
 			);
-			name = svc;
-			path = ../../../../../api/svc;
+			path = src;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -420,28 +394,28 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CE442FD18B6FC590017DF25 /* pic_queue.cpp in Sources */,
-				4CE4430118B6FC590017DF25 /* welsDecoderExt.cpp in Sources */,
-				4CE442F518B6FC590017DF25 /* fmo.cpp in Sources */,
-				4CE442FF18B6FC590017DF25 /* utils.cpp in Sources */,
-				4CE442F318B6FC590017DF25 /* decoder_data_tables.cpp in Sources */,
-				4CE442F918B6FC590017DF25 /* mem_align.cpp in Sources */,
-				4CE442F718B6FC590017DF25 /* manage_dec_ref.cpp in Sources */,
-				4CE442EC18B6FC590017DF25 /* au_parser.cpp in Sources */,
-				4CE442F418B6FC590017DF25 /* expand_pic.cpp in Sources */,
-				4CE442FB18B6FC590017DF25 /* mv_pred.cpp in Sources */,
-				4CE442F618B6FC590017DF25 /* get_intra_predictor.cpp in Sources */,
-				4CE442F218B6FC590017DF25 /* decoder_core.cpp in Sources */,
-				4CE4430018B6FC590017DF25 /* welsCodecTrace.cpp in Sources */,
-				4CE442F818B6FC590017DF25 /* mc.cpp in Sources */,
-				4CE442FE18B6FC590017DF25 /* rec_mb.cpp in Sources */,
-				4CE442ED18B6FC590017DF25 /* bit_stream.cpp in Sources */,
-				4CE442EF18B6FC590017DF25 /* decode_mb_aux.cpp in Sources */,
-				4CE442F018B6FC590017DF25 /* decode_slice.cpp in Sources */,
-				4CE442F118B6FC590017DF25 /* decoder.cpp in Sources */,
-				4CE442FA18B6FC590017DF25 /* memmgr_nal_unit.cpp in Sources */,
-				4CE442EE18B6FC590017DF25 /* deblocking.cpp in Sources */,
-				4CE442FC18B6FC590017DF25 /* parse_mb_syn_cavlc.cpp in Sources */,
+				4CE4469B18BC5EAB0017DF25 /* pic_queue.cpp in Sources */,
+				4CE4469F18BC5EAB0017DF25 /* welsDecoderExt.cpp in Sources */,
+				4CE4469318BC5EAB0017DF25 /* fmo.cpp in Sources */,
+				4CE4469D18BC5EAB0017DF25 /* utils.cpp in Sources */,
+				4CE4469118BC5EAB0017DF25 /* decoder_data_tables.cpp in Sources */,
+				4CE4469718BC5EAB0017DF25 /* mem_align.cpp in Sources */,
+				4CE4469518BC5EAB0017DF25 /* manage_dec_ref.cpp in Sources */,
+				4CE4468A18BC5EAB0017DF25 /* au_parser.cpp in Sources */,
+				4CE4469218BC5EAB0017DF25 /* expand_pic.cpp in Sources */,
+				4CE4469918BC5EAB0017DF25 /* mv_pred.cpp in Sources */,
+				4CE4469418BC5EAB0017DF25 /* get_intra_predictor.cpp in Sources */,
+				4CE4469018BC5EAB0017DF25 /* decoder_core.cpp in Sources */,
+				4CE4469E18BC5EAB0017DF25 /* welsCodecTrace.cpp in Sources */,
+				4CE4469618BC5EAB0017DF25 /* mc.cpp in Sources */,
+				4CE4469C18BC5EAB0017DF25 /* rec_mb.cpp in Sources */,
+				4CE4468B18BC5EAB0017DF25 /* bit_stream.cpp in Sources */,
+				4CE4468D18BC5EAB0017DF25 /* decode_mb_aux.cpp in Sources */,
+				4CE4468E18BC5EAB0017DF25 /* decode_slice.cpp in Sources */,
+				4CE4468F18BC5EAB0017DF25 /* decoder.cpp in Sources */,
+				4CE4469818BC5EAB0017DF25 /* memmgr_nal_unit.cpp in Sources */,
+				4CE4468C18BC5EAB0017DF25 /* deblocking.cpp in Sources */,
+				4CE4469A18BC5EAB0017DF25 /* parse_mb_syn_cavlc.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -562,8 +536,6 @@
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../../../../common\"",
-					"$(SRCROOT)/../../../../decoder/core/inc",
-					"$(SRCROOT)/../../../../decoder/plus/inc",
 					"$(SRCROOT)/../../../../api/svc",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
@@ -589,8 +561,6 @@
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../../../../common\"",
-					"$(SRCROOT)/../../../../decoder/core/inc",
-					"$(SRCROOT)/../../../../decoder/plus/inc",
 					"$(SRCROOT)/../../../../api/svc",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
@@ -658,6 +628,7 @@
 				4CE4429E18B6FC360017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		4CE4429F18B6FC360017DF25 /* Build configuration list for PBXNativeTarget "welsdecTests" */ = {
 			isa = XCConfigurationList;
@@ -666,6 +637,7 @@
 				4CE442A118B6FC360017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
--- a/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
@@ -14,38 +14,38 @@
 		4CE4432918B6FFA00017DF25 /* libwelsenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE4431118B6FFA00017DF25 /* libwelsenc.a */; };
 		4CE4432F18B6FFA00017DF25 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4CE4432D18B6FFA00017DF25 /* InfoPlist.strings */; };
 		4CE4433118B6FFA00017DF25 /* welsencTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4433018B6FFA00017DF25 /* welsencTests.m */; };
-		4CE443A618B6FFB80017DF25 /* au_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437618B6FFB80017DF25 /* au_set.cpp */; };
-		4CE443A718B6FFB80017DF25 /* deblocking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437718B6FFB80017DF25 /* deblocking.cpp */; };
-		4CE443A818B6FFB80017DF25 /* decode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437818B6FFB80017DF25 /* decode_mb_aux.cpp */; };
-		4CE443A918B6FFB80017DF25 /* encode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437918B6FFB80017DF25 /* encode_mb_aux.cpp */; };
-		4CE443AA18B6FFB80017DF25 /* encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437A18B6FFB80017DF25 /* encoder.cpp */; };
-		4CE443AB18B6FFB80017DF25 /* encoder_data_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437B18B6FFB80017DF25 /* encoder_data_tables.cpp */; };
-		4CE443AC18B6FFB80017DF25 /* encoder_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437C18B6FFB80017DF25 /* encoder_ext.cpp */; };
-		4CE443AD18B6FFB80017DF25 /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437D18B6FFB80017DF25 /* expand_pic.cpp */; };
-		4CE443AE18B6FFB80017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437E18B6FFB80017DF25 /* get_intra_predictor.cpp */; };
-		4CE443AF18B6FFB80017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4437F18B6FFB80017DF25 /* mc.cpp */; };
-		4CE443B018B6FFB80017DF25 /* md.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438018B6FFB80017DF25 /* md.cpp */; };
-		4CE443B118B6FFB80017DF25 /* memory_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438118B6FFB80017DF25 /* memory_align.cpp */; };
-		4CE443B218B6FFB80017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438218B6FFB80017DF25 /* mv_pred.cpp */; };
-		4CE443B318B6FFB80017DF25 /* nal_encap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438318B6FFB80017DF25 /* nal_encap.cpp */; };
-		4CE443B418B6FFB80017DF25 /* picture_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438418B6FFB80017DF25 /* picture_handle.cpp */; };
-		4CE443B518B6FFB80017DF25 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438518B6FFB80017DF25 /* property.cpp */; };
-		4CE443B618B6FFB80017DF25 /* ratectl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438618B6FFB80017DF25 /* ratectl.cpp */; };
-		4CE443B718B6FFB80017DF25 /* ref_list_mgr_svc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438718B6FFB80017DF25 /* ref_list_mgr_svc.cpp */; };
-		4CE443B818B6FFB80017DF25 /* sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438818B6FFB80017DF25 /* sample.cpp */; };
-		4CE443B918B6FFB80017DF25 /* set_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438918B6FFB80017DF25 /* set_mb_syn_cavlc.cpp */; };
-		4CE443BA18B6FFB80017DF25 /* slice_multi_threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438A18B6FFB80017DF25 /* slice_multi_threading.cpp */; };
-		4CE443BB18B6FFB80017DF25 /* svc_base_layer_md.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438B18B6FFB80017DF25 /* svc_base_layer_md.cpp */; };
-		4CE443BC18B6FFB80017DF25 /* svc_enc_slice_segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438C18B6FFB80017DF25 /* svc_enc_slice_segment.cpp */; };
-		4CE443BD18B6FFB80017DF25 /* svc_encode_mb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438D18B6FFB80017DF25 /* svc_encode_mb.cpp */; };
-		4CE443BE18B6FFB80017DF25 /* svc_encode_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438E18B6FFB80017DF25 /* svc_encode_slice.cpp */; };
-		4CE443BF18B6FFB80017DF25 /* svc_mode_decision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4438F18B6FFB80017DF25 /* svc_mode_decision.cpp */; };
-		4CE443C018B6FFB80017DF25 /* svc_motion_estimate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439018B6FFB80017DF25 /* svc_motion_estimate.cpp */; };
-		4CE443C118B6FFB80017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439118B6FFB80017DF25 /* svc_set_mb_syn_cavlc.cpp */; };
-		4CE443C218B6FFB80017DF25 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439218B6FFB80017DF25 /* utils.cpp */; };
-		4CE443C318B6FFB80017DF25 /* wels_preprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439318B6FFB80017DF25 /* wels_preprocess.cpp */; };
-		4CE443C518B6FFB80017DF25 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439E18B6FFB80017DF25 /* welsCodecTrace.cpp */; };
-		4CE443C618B6FFB80017DF25 /* welsEncoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4439F18B6FFB80017DF25 /* welsEncoderExt.cpp */; };
+		4CE4470E18BC605C0017DF25 /* au_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446DD18BC605C0017DF25 /* au_set.cpp */; };
+		4CE4470F18BC605C0017DF25 /* deblocking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446DE18BC605C0017DF25 /* deblocking.cpp */; };
+		4CE4471018BC605C0017DF25 /* decode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446DF18BC605C0017DF25 /* decode_mb_aux.cpp */; };
+		4CE4471118BC605C0017DF25 /* encode_mb_aux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E018BC605C0017DF25 /* encode_mb_aux.cpp */; };
+		4CE4471218BC605C0017DF25 /* encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E118BC605C0017DF25 /* encoder.cpp */; };
+		4CE4471318BC605C0017DF25 /* encoder_data_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */; };
+		4CE4471418BC605C0017DF25 /* encoder_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E318BC605C0017DF25 /* encoder_ext.cpp */; };
+		4CE4471518BC605C0017DF25 /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E418BC605C0017DF25 /* expand_pic.cpp */; };
+		4CE4471618BC605C0017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */; };
+		4CE4471718BC605C0017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E618BC605C0017DF25 /* mc.cpp */; };
+		4CE4471818BC605C0017DF25 /* md.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E718BC605C0017DF25 /* md.cpp */; };
+		4CE4471918BC605C0017DF25 /* memory_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E818BC605C0017DF25 /* memory_align.cpp */; };
+		4CE4471A18BC605C0017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E918BC605C0017DF25 /* mv_pred.cpp */; };
+		4CE4471B18BC605C0017DF25 /* nal_encap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EA18BC605C0017DF25 /* nal_encap.cpp */; };
+		4CE4471C18BC605C0017DF25 /* picture_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EB18BC605C0017DF25 /* picture_handle.cpp */; };
+		4CE4471D18BC605C0017DF25 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EC18BC605C0017DF25 /* property.cpp */; };
+		4CE4471E18BC605C0017DF25 /* ratectl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446ED18BC605C0017DF25 /* ratectl.cpp */; };
+		4CE4471F18BC605C0017DF25 /* ref_list_mgr_svc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */; };
+		4CE4472018BC605C0017DF25 /* sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EF18BC605C0017DF25 /* sample.cpp */; };
+		4CE4472118BC605C0017DF25 /* set_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F018BC605C0017DF25 /* set_mb_syn_cavlc.cpp */; };
+		4CE4472218BC605C0017DF25 /* slice_multi_threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F118BC605C0017DF25 /* slice_multi_threading.cpp */; };
+		4CE4472318BC605C0017DF25 /* svc_base_layer_md.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F218BC605C0017DF25 /* svc_base_layer_md.cpp */; };
+		4CE4472418BC605C0017DF25 /* svc_enc_slice_segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F318BC605C0017DF25 /* svc_enc_slice_segment.cpp */; };
+		4CE4472518BC605C0017DF25 /* svc_encode_mb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F418BC605C0017DF25 /* svc_encode_mb.cpp */; };
+		4CE4472618BC605C0017DF25 /* svc_encode_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F518BC605C0017DF25 /* svc_encode_slice.cpp */; };
+		4CE4472718BC605C0017DF25 /* svc_mode_decision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F618BC605C0017DF25 /* svc_mode_decision.cpp */; };
+		4CE4472818BC605C0017DF25 /* svc_motion_estimate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F718BC605C0017DF25 /* svc_motion_estimate.cpp */; };
+		4CE4472918BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F818BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp */; };
+		4CE4472A18BC605C0017DF25 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F918BC605C0017DF25 /* utils.cpp */; };
+		4CE4472B18BC605C0017DF25 /* wels_preprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446FA18BC605C0017DF25 /* wels_preprocess.cpp */; };
+		4CE4472D18BC605C0017DF25 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4470518BC605C0017DF25 /* welsCodecTrace.cpp */; };
+		4CE4472E18BC605C0017DF25 /* welsEncoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4470618BC605C0017DF25 /* welsEncoderExt.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -73,7 +73,6 @@
 /* Begin PBXFileReference section */
 		4CE4431118B6FFA00017DF25 /* libwelsenc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwelsenc.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4431418B6FFA00017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		4CE4431818B6FFA00017DF25 /* welsenc-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "welsenc-Prefix.pch"; sourceTree = "<group>"; };
 		4CE4432118B6FFA00017DF25 /* welsencTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = welsencTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4432218B6FFA00017DF25 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4CE4432518B6FFA00017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -80,94 +79,91 @@
 		4CE4432C18B6FFA00017DF25 /* welsencTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "welsencTests-Info.plist"; sourceTree = "<group>"; };
 		4CE4432E18B6FFA00017DF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4CE4433018B6FFA00017DF25 /* welsencTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = welsencTests.m; sourceTree = "<group>"; };
-		4CE4434318B6FFB80017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
-		4CE4434418B6FFB80017DF25 /* au_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_set.h; sourceTree = "<group>"; };
-		4CE4434518B6FFB80017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
-		4CE4434618B6FFB80017DF25 /* bundleloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bundleloader.h; sourceTree = "<group>"; };
-		4CE4434718B6FFB80017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
-		4CE4434818B6FFB80017DF25 /* decode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_mb_aux.h; sourceTree = "<group>"; };
-		4CE4434918B6FFB80017DF25 /* dq_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dq_map.h; sourceTree = "<group>"; };
-		4CE4434A18B6FFB80017DF25 /* encode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encode_mb_aux.h; sourceTree = "<group>"; };
-		4CE4434B18B6FFB80017DF25 /* encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoder.h; sourceTree = "<group>"; };
-		4CE4434C18B6FFB80017DF25 /* encoder_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoder_context.h; sourceTree = "<group>"; };
-		4CE4434D18B6FFB80017DF25 /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_pic.h; sourceTree = "<group>"; };
-		4CE4434E18B6FFB80017DF25 /* extern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extern.h; sourceTree = "<group>"; };
-		4CE4434F18B6FFB80017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; };
-		4CE4435018B6FFB80017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
-		4CE4435118B6FFB80017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
-		4CE4435218B6FFB80017DF25 /* md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md.h; sourceTree = "<group>"; };
-		4CE4435318B6FFB80017DF25 /* memory_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_align.h; sourceTree = "<group>"; };
-		4CE4435418B6FFB80017DF25 /* mt_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mt_defs.h; sourceTree = "<group>"; };
-		4CE4435518B6FFB80017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
-		4CE4435618B6FFB80017DF25 /* nal_encap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_encap.h; sourceTree = "<group>"; };
-		4CE4435718B6FFB80017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
-		4CE4435818B6FFB80017DF25 /* param_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = param_svc.h; sourceTree = "<group>"; };
-		4CE4435918B6FFB80017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; };
-		4CE4435A18B6FFB80017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
-		4CE4435B18B6FFB80017DF25 /* picture_handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture_handle.h; sourceTree = "<group>"; };
-		4CE4435C18B6FFB80017DF25 /* property.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = property.h; sourceTree = "<group>"; };
-		4CE4435D18B6FFB80017DF25 /* rc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc.h; sourceTree = "<group>"; };
-		4CE4435E18B6FFB80017DF25 /* ref_list_mgr_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ref_list_mgr_svc.h; sourceTree = "<group>"; };
-		4CE4435F18B6FFB80017DF25 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
-		4CE4436018B6FFB80017DF25 /* set_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = set_mb_syn_cavlc.h; sourceTree = "<group>"; };
-		4CE4436118B6FFB80017DF25 /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; };
-		4CE4436218B6FFB80017DF25 /* slice_multi_threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice_multi_threading.h; sourceTree = "<group>"; };
-		4CE4436318B6FFB80017DF25 /* stat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stat.h; sourceTree = "<group>"; };
-		4CE4436418B6FFB80017DF25 /* svc_base_layer_md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_base_layer_md.h; sourceTree = "<group>"; };
-		4CE4436518B6FFB80017DF25 /* svc_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_config.h; sourceTree = "<group>"; };
-		4CE4436618B6FFB80017DF25 /* svc_enc_frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_frame.h; sourceTree = "<group>"; };
-		4CE4436718B6FFB80017DF25 /* svc_enc_golomb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_golomb.h; sourceTree = "<group>"; };
-		4CE4436818B6FFB80017DF25 /* svc_enc_macroblock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_macroblock.h; sourceTree = "<group>"; };
-		4CE4436918B6FFB80017DF25 /* svc_enc_slice_segment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_slice_segment.h; sourceTree = "<group>"; };
-		4CE4436A18B6FFB80017DF25 /* svc_encode_mb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_encode_mb.h; sourceTree = "<group>"; };
-		4CE4436B18B6FFB80017DF25 /* svc_encode_slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_encode_slice.h; sourceTree = "<group>"; };
-		4CE4436C18B6FFB80017DF25 /* svc_mode_decision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_mode_decision.h; sourceTree = "<group>"; };
-		4CE4436D18B6FFB80017DF25 /* svc_motion_estimate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_motion_estimate.h; sourceTree = "<group>"; };
-		4CE4436E18B6FFB80017DF25 /* svc_set_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_set_mb_syn_cavlc.h; sourceTree = "<group>"; };
-		4CE4436F18B6FFB80017DF25 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		4CE4437018B6FFB80017DF25 /* vlc_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc_encoder.h; sourceTree = "<group>"; };
-		4CE4437118B6FFB80017DF25 /* wels_common_basis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_common_basis.h; sourceTree = "<group>"; };
-		4CE4437218B6FFB80017DF25 /* wels_const.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_const.h; sourceTree = "<group>"; };
-		4CE4437318B6FFB80017DF25 /* wels_func_ptr_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_func_ptr_def.h; sourceTree = "<group>"; };
-		4CE4437418B6FFB80017DF25 /* wels_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_preprocess.h; sourceTree = "<group>"; };
-		4CE4437618B6FFB80017DF25 /* au_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = au_set.cpp; sourceTree = "<group>"; };
-		4CE4437718B6FFB80017DF25 /* deblocking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking.cpp; sourceTree = "<group>"; };
-		4CE4437818B6FFB80017DF25 /* decode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_mb_aux.cpp; sourceTree = "<group>"; };
-		4CE4437918B6FFB80017DF25 /* encode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encode_mb_aux.cpp; sourceTree = "<group>"; };
-		4CE4437A18B6FFB80017DF25 /* encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder.cpp; sourceTree = "<group>"; };
-		4CE4437B18B6FFB80017DF25 /* encoder_data_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_data_tables.cpp; sourceTree = "<group>"; };
-		4CE4437C18B6FFB80017DF25 /* encoder_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_ext.cpp; sourceTree = "<group>"; };
-		4CE4437D18B6FFB80017DF25 /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expand_pic.cpp; sourceTree = "<group>"; };
-		4CE4437E18B6FFB80017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
-		4CE4437F18B6FFB80017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
-		4CE4438018B6FFB80017DF25 /* md.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = md.cpp; sourceTree = "<group>"; };
-		4CE4438118B6FFB80017DF25 /* memory_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_align.cpp; sourceTree = "<group>"; };
-		4CE4438218B6FFB80017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
-		4CE4438318B6FFB80017DF25 /* nal_encap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nal_encap.cpp; sourceTree = "<group>"; };
-		4CE4438418B6FFB80017DF25 /* picture_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture_handle.cpp; sourceTree = "<group>"; };
-		4CE4438518B6FFB80017DF25 /* property.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property.cpp; sourceTree = "<group>"; };
-		4CE4438618B6FFB80017DF25 /* ratectl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ratectl.cpp; sourceTree = "<group>"; };
-		4CE4438718B6FFB80017DF25 /* ref_list_mgr_svc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_list_mgr_svc.cpp; sourceTree = "<group>"; };
-		4CE4438818B6FFB80017DF25 /* sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample.cpp; sourceTree = "<group>"; };
-		4CE4438918B6FFB80017DF25 /* set_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = set_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
-		4CE4438A18B6FFB80017DF25 /* slice_multi_threading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slice_multi_threading.cpp; sourceTree = "<group>"; };
-		4CE4438B18B6FFB80017DF25 /* svc_base_layer_md.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_base_layer_md.cpp; sourceTree = "<group>"; };
-		4CE4438C18B6FFB80017DF25 /* svc_enc_slice_segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_enc_slice_segment.cpp; sourceTree = "<group>"; };
-		4CE4438D18B6FFB80017DF25 /* svc_encode_mb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_encode_mb.cpp; sourceTree = "<group>"; };
-		4CE4438E18B6FFB80017DF25 /* svc_encode_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_encode_slice.cpp; sourceTree = "<group>"; };
-		4CE4438F18B6FFB80017DF25 /* svc_mode_decision.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_mode_decision.cpp; sourceTree = "<group>"; };
-		4CE4439018B6FFB80017DF25 /* svc_motion_estimate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_motion_estimate.cpp; sourceTree = "<group>"; };
-		4CE4439118B6FFB80017DF25 /* svc_set_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_set_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
-		4CE4439218B6FFB80017DF25 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
-		4CE4439318B6FFB80017DF25 /* wels_preprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wels_preprocess.cpp; sourceTree = "<group>"; };
-		4CE4439618B6FFB80017DF25 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsCodecTrace.h; sourceTree = "<group>"; };
-		4CE4439718B6FFB80017DF25 /* welsEncoderExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsEncoderExt.h; sourceTree = "<group>"; };
-		4CE4439D18B6FFB80017DF25 /* wels_enc_export.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wels_enc_export.def; sourceTree = "<group>"; };
-		4CE4439E18B6FFB80017DF25 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsCodecTrace.cpp; sourceTree = "<group>"; };
-		4CE4439F18B6FFB80017DF25 /* welsEncoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsEncoderExt.cpp; sourceTree = "<group>"; };
-		4CE443C818B6FFC70017DF25 /* codec_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_api.h; sourceTree = "<group>"; };
-		4CE443C918B6FFC70017DF25 /* codec_app_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_app_def.h; sourceTree = "<group>"; };
-		4CE443CA18B6FFC70017DF25 /* codec_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_def.h; sourceTree = "<group>"; };
+		4CE446AA18BC605C0017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
+		4CE446AB18BC605C0017DF25 /* au_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_set.h; sourceTree = "<group>"; };
+		4CE446AC18BC605C0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
+		4CE446AD18BC605C0017DF25 /* bundleloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bundleloader.h; sourceTree = "<group>"; };
+		4CE446AE18BC605C0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
+		4CE446AF18BC605C0017DF25 /* decode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_mb_aux.h; sourceTree = "<group>"; };
+		4CE446B018BC605C0017DF25 /* dq_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dq_map.h; sourceTree = "<group>"; };
+		4CE446B118BC605C0017DF25 /* encode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encode_mb_aux.h; sourceTree = "<group>"; };
+		4CE446B218BC605C0017DF25 /* encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoder.h; sourceTree = "<group>"; };
+		4CE446B318BC605C0017DF25 /* encoder_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoder_context.h; sourceTree = "<group>"; };
+		4CE446B418BC605C0017DF25 /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_pic.h; sourceTree = "<group>"; };
+		4CE446B518BC605C0017DF25 /* extern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extern.h; sourceTree = "<group>"; };
+		4CE446B618BC605C0017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; };
+		4CE446B718BC605C0017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
+		4CE446B818BC605C0017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
+		4CE446B918BC605C0017DF25 /* md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md.h; sourceTree = "<group>"; };
+		4CE446BA18BC605C0017DF25 /* memory_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_align.h; sourceTree = "<group>"; };
+		4CE446BB18BC605C0017DF25 /* mt_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mt_defs.h; sourceTree = "<group>"; };
+		4CE446BC18BC605C0017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
+		4CE446BD18BC605C0017DF25 /* nal_encap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_encap.h; sourceTree = "<group>"; };
+		4CE446BE18BC605C0017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
+		4CE446BF18BC605C0017DF25 /* param_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = param_svc.h; sourceTree = "<group>"; };
+		4CE446C018BC605C0017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; };
+		4CE446C118BC605C0017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
+		4CE446C218BC605C0017DF25 /* picture_handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture_handle.h; sourceTree = "<group>"; };
+		4CE446C318BC605C0017DF25 /* property.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = property.h; sourceTree = "<group>"; };
+		4CE446C418BC605C0017DF25 /* rc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc.h; sourceTree = "<group>"; };
+		4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ref_list_mgr_svc.h; sourceTree = "<group>"; };
+		4CE446C618BC605C0017DF25 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
+		4CE446C718BC605C0017DF25 /* set_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = set_mb_syn_cavlc.h; sourceTree = "<group>"; };
+		4CE446C818BC605C0017DF25 /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; };
+		4CE446C918BC605C0017DF25 /* slice_multi_threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice_multi_threading.h; sourceTree = "<group>"; };
+		4CE446CA18BC605C0017DF25 /* stat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stat.h; sourceTree = "<group>"; };
+		4CE446CB18BC605C0017DF25 /* svc_base_layer_md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_base_layer_md.h; sourceTree = "<group>"; };
+		4CE446CC18BC605C0017DF25 /* svc_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_config.h; sourceTree = "<group>"; };
+		4CE446CD18BC605C0017DF25 /* svc_enc_frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_frame.h; sourceTree = "<group>"; };
+		4CE446CE18BC605C0017DF25 /* svc_enc_golomb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_golomb.h; sourceTree = "<group>"; };
+		4CE446CF18BC605C0017DF25 /* svc_enc_macroblock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_macroblock.h; sourceTree = "<group>"; };
+		4CE446D018BC605C0017DF25 /* svc_enc_slice_segment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_enc_slice_segment.h; sourceTree = "<group>"; };
+		4CE446D118BC605C0017DF25 /* svc_encode_mb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_encode_mb.h; sourceTree = "<group>"; };
+		4CE446D218BC605C0017DF25 /* svc_encode_slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_encode_slice.h; sourceTree = "<group>"; };
+		4CE446D318BC605C0017DF25 /* svc_mode_decision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_mode_decision.h; sourceTree = "<group>"; };
+		4CE446D418BC605C0017DF25 /* svc_motion_estimate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_motion_estimate.h; sourceTree = "<group>"; };
+		4CE446D518BC605C0017DF25 /* svc_set_mb_syn_cavlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_set_mb_syn_cavlc.h; sourceTree = "<group>"; };
+		4CE446D618BC605C0017DF25 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		4CE446D718BC605C0017DF25 /* vlc_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc_encoder.h; sourceTree = "<group>"; };
+		4CE446D818BC605C0017DF25 /* wels_common_basis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_common_basis.h; sourceTree = "<group>"; };
+		4CE446D918BC605C0017DF25 /* wels_const.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_const.h; sourceTree = "<group>"; };
+		4CE446DA18BC605C0017DF25 /* wels_func_ptr_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_func_ptr_def.h; sourceTree = "<group>"; };
+		4CE446DB18BC605C0017DF25 /* wels_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_preprocess.h; sourceTree = "<group>"; };
+		4CE446DD18BC605C0017DF25 /* au_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = au_set.cpp; sourceTree = "<group>"; };
+		4CE446DE18BC605C0017DF25 /* deblocking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deblocking.cpp; sourceTree = "<group>"; };
+		4CE446DF18BC605C0017DF25 /* decode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode_mb_aux.cpp; sourceTree = "<group>"; };
+		4CE446E018BC605C0017DF25 /* encode_mb_aux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encode_mb_aux.cpp; sourceTree = "<group>"; };
+		4CE446E118BC605C0017DF25 /* encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder.cpp; sourceTree = "<group>"; };
+		4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_data_tables.cpp; sourceTree = "<group>"; };
+		4CE446E318BC605C0017DF25 /* encoder_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_ext.cpp; sourceTree = "<group>"; };
+		4CE446E418BC605C0017DF25 /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expand_pic.cpp; sourceTree = "<group>"; };
+		4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
+		4CE446E618BC605C0017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
+		4CE446E718BC605C0017DF25 /* md.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = md.cpp; sourceTree = "<group>"; };
+		4CE446E818BC605C0017DF25 /* memory_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_align.cpp; sourceTree = "<group>"; };
+		4CE446E918BC605C0017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
+		4CE446EA18BC605C0017DF25 /* nal_encap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nal_encap.cpp; sourceTree = "<group>"; };
+		4CE446EB18BC605C0017DF25 /* picture_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture_handle.cpp; sourceTree = "<group>"; };
+		4CE446EC18BC605C0017DF25 /* property.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property.cpp; sourceTree = "<group>"; };
+		4CE446ED18BC605C0017DF25 /* ratectl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ratectl.cpp; sourceTree = "<group>"; };
+		4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_list_mgr_svc.cpp; sourceTree = "<group>"; };
+		4CE446EF18BC605C0017DF25 /* sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample.cpp; sourceTree = "<group>"; };
+		4CE446F018BC605C0017DF25 /* set_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = set_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
+		4CE446F118BC605C0017DF25 /* slice_multi_threading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slice_multi_threading.cpp; sourceTree = "<group>"; };
+		4CE446F218BC605C0017DF25 /* svc_base_layer_md.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_base_layer_md.cpp; sourceTree = "<group>"; };
+		4CE446F318BC605C0017DF25 /* svc_enc_slice_segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_enc_slice_segment.cpp; sourceTree = "<group>"; };
+		4CE446F418BC605C0017DF25 /* svc_encode_mb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_encode_mb.cpp; sourceTree = "<group>"; };
+		4CE446F518BC605C0017DF25 /* svc_encode_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_encode_slice.cpp; sourceTree = "<group>"; };
+		4CE446F618BC605C0017DF25 /* svc_mode_decision.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_mode_decision.cpp; sourceTree = "<group>"; };
+		4CE446F718BC605C0017DF25 /* svc_motion_estimate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_motion_estimate.cpp; sourceTree = "<group>"; };
+		4CE446F818BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_set_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
+		4CE446F918BC605C0017DF25 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
+		4CE446FA18BC605C0017DF25 /* wels_preprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wels_preprocess.cpp; sourceTree = "<group>"; };
+		4CE446FD18BC605C0017DF25 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsCodecTrace.h; sourceTree = "<group>"; };
+		4CE446FE18BC605C0017DF25 /* welsEncoderExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsEncoderExt.h; sourceTree = "<group>"; };
+		4CE4470418BC605C0017DF25 /* wels_enc_export.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wels_enc_export.def; sourceTree = "<group>"; };
+		4CE4470518BC605C0017DF25 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsCodecTrace.cpp; sourceTree = "<group>"; };
+		4CE4470618BC605C0017DF25 /* welsEncoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsEncoderExt.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -196,7 +192,7 @@
 		4CE4430818B6FFA00017DF25 = {
 			isa = PBXGroup;
 			children = (
-				4CE4431618B6FFA00017DF25 /* welsenc */,
+				4CE446A018BC605B0017DF25 /* encoder */,
 				4CE4432A18B6FFA00017DF25 /* welsencTests */,
 				4CE4431318B6FFA00017DF25 /* Frameworks */,
 				4CE4431218B6FFA00017DF25 /* Products */,
@@ -222,25 +218,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4CE4431618B6FFA00017DF25 /* welsenc */ = {
-			isa = PBXGroup;
-			children = (
-				4CE443C718B6FFC70017DF25 /* svc */,
-				4CE4433A18B6FFB70017DF25 /* core */,
-				4CE4439418B6FFB80017DF25 /* plus */,
-				4CE4431718B6FFA00017DF25 /* Supporting Files */,
-			);
-			path = welsenc;
-			sourceTree = "<group>";
-		};
-		4CE4431718B6FFA00017DF25 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				4CE4431818B6FFA00017DF25 /* welsenc-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		4CE4432A18B6FFA00017DF25 /* welsencTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -259,148 +236,145 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		4CE4433A18B6FFB70017DF25 /* core */ = {
+		4CE446A018BC605B0017DF25 /* encoder */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4434218B6FFB80017DF25 /* inc */,
-				4CE4437518B6FFB80017DF25 /* src */,
+				4CE446A118BC605B0017DF25 /* core */,
+				4CE446FB18BC605C0017DF25 /* plus */,
 			);
-			name = core;
-			path = ../../../../../encoder/core;
+			name = encoder;
+			path = ../../../../encoder;
 			sourceTree = "<group>";
 		};
-		4CE4434218B6FFB80017DF25 /* inc */ = {
+		4CE446A118BC605B0017DF25 /* core */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4434318B6FFB80017DF25 /* as264_common.h */,
-				4CE4434418B6FFB80017DF25 /* au_set.h */,
-				4CE4434518B6FFB80017DF25 /* bit_stream.h */,
-				4CE4434618B6FFB80017DF25 /* bundleloader.h */,
-				4CE4434718B6FFB80017DF25 /* deblocking.h */,
-				4CE4434818B6FFB80017DF25 /* decode_mb_aux.h */,
-				4CE4434918B6FFB80017DF25 /* dq_map.h */,
-				4CE4434A18B6FFB80017DF25 /* encode_mb_aux.h */,
-				4CE4434B18B6FFB80017DF25 /* encoder.h */,
-				4CE4434C18B6FFB80017DF25 /* encoder_context.h */,
-				4CE4434D18B6FFB80017DF25 /* expand_pic.h */,
-				4CE4434E18B6FFB80017DF25 /* extern.h */,
-				4CE4434F18B6FFB80017DF25 /* get_intra_predictor.h */,
-				4CE4435018B6FFB80017DF25 /* mb_cache.h */,
-				4CE4435118B6FFB80017DF25 /* mc.h */,
-				4CE4435218B6FFB80017DF25 /* md.h */,
-				4CE4435318B6FFB80017DF25 /* memory_align.h */,
-				4CE4435418B6FFB80017DF25 /* mt_defs.h */,
-				4CE4435518B6FFB80017DF25 /* mv_pred.h */,
-				4CE4435618B6FFB80017DF25 /* nal_encap.h */,
-				4CE4435718B6FFB80017DF25 /* nal_prefix.h */,
-				4CE4435818B6FFB80017DF25 /* param_svc.h */,
-				4CE4435918B6FFB80017DF25 /* parameter_sets.h */,
-				4CE4435A18B6FFB80017DF25 /* picture.h */,
-				4CE4435B18B6FFB80017DF25 /* picture_handle.h */,
-				4CE4435C18B6FFB80017DF25 /* property.h */,
-				4CE4435D18B6FFB80017DF25 /* rc.h */,
-				4CE4435E18B6FFB80017DF25 /* ref_list_mgr_svc.h */,
-				4CE4435F18B6FFB80017DF25 /* sample.h */,
-				4CE4436018B6FFB80017DF25 /* set_mb_syn_cavlc.h */,
-				4CE4436118B6FFB80017DF25 /* slice.h */,
-				4CE4436218B6FFB80017DF25 /* slice_multi_threading.h */,
-				4CE4436318B6FFB80017DF25 /* stat.h */,
-				4CE4436418B6FFB80017DF25 /* svc_base_layer_md.h */,
-				4CE4436518B6FFB80017DF25 /* svc_config.h */,
-				4CE4436618B6FFB80017DF25 /* svc_enc_frame.h */,
-				4CE4436718B6FFB80017DF25 /* svc_enc_golomb.h */,
-				4CE4436818B6FFB80017DF25 /* svc_enc_macroblock.h */,
-				4CE4436918B6FFB80017DF25 /* svc_enc_slice_segment.h */,
-				4CE4436A18B6FFB80017DF25 /* svc_encode_mb.h */,
-				4CE4436B18B6FFB80017DF25 /* svc_encode_slice.h */,
-				4CE4436C18B6FFB80017DF25 /* svc_mode_decision.h */,
-				4CE4436D18B6FFB80017DF25 /* svc_motion_estimate.h */,
-				4CE4436E18B6FFB80017DF25 /* svc_set_mb_syn_cavlc.h */,
-				4CE4436F18B6FFB80017DF25 /* utils.h */,
-				4CE4437018B6FFB80017DF25 /* vlc_encoder.h */,
-				4CE4437118B6FFB80017DF25 /* wels_common_basis.h */,
-				4CE4437218B6FFB80017DF25 /* wels_const.h */,
-				4CE4437318B6FFB80017DF25 /* wels_func_ptr_def.h */,
-				4CE4437418B6FFB80017DF25 /* wels_preprocess.h */,
+				4CE446A918BC605C0017DF25 /* inc */,
+				4CE446DC18BC605C0017DF25 /* src */,
 			);
-			path = inc;
+			path = core;
 			sourceTree = "<group>";
 		};
-		4CE4437518B6FFB80017DF25 /* src */ = {
+		4CE446A918BC605C0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4437618B6FFB80017DF25 /* au_set.cpp */,
-				4CE4437718B6FFB80017DF25 /* deblocking.cpp */,
-				4CE4437818B6FFB80017DF25 /* decode_mb_aux.cpp */,
-				4CE4437918B6FFB80017DF25 /* encode_mb_aux.cpp */,
-				4CE4437A18B6FFB80017DF25 /* encoder.cpp */,
-				4CE4437B18B6FFB80017DF25 /* encoder_data_tables.cpp */,
-				4CE4437C18B6FFB80017DF25 /* encoder_ext.cpp */,
-				4CE4437D18B6FFB80017DF25 /* expand_pic.cpp */,
-				4CE4437E18B6FFB80017DF25 /* get_intra_predictor.cpp */,
-				4CE4437F18B6FFB80017DF25 /* mc.cpp */,
-				4CE4438018B6FFB80017DF25 /* md.cpp */,
-				4CE4438118B6FFB80017DF25 /* memory_align.cpp */,
-				4CE4438218B6FFB80017DF25 /* mv_pred.cpp */,
-				4CE4438318B6FFB80017DF25 /* nal_encap.cpp */,
-				4CE4438418B6FFB80017DF25 /* picture_handle.cpp */,
-				4CE4438518B6FFB80017DF25 /* property.cpp */,
-				4CE4438618B6FFB80017DF25 /* ratectl.cpp */,
-				4CE4438718B6FFB80017DF25 /* ref_list_mgr_svc.cpp */,
-				4CE4438818B6FFB80017DF25 /* sample.cpp */,
-				4CE4438918B6FFB80017DF25 /* set_mb_syn_cavlc.cpp */,
-				4CE4438A18B6FFB80017DF25 /* slice_multi_threading.cpp */,
-				4CE4438B18B6FFB80017DF25 /* svc_base_layer_md.cpp */,
-				4CE4438C18B6FFB80017DF25 /* svc_enc_slice_segment.cpp */,
-				4CE4438D18B6FFB80017DF25 /* svc_encode_mb.cpp */,
-				4CE4438E18B6FFB80017DF25 /* svc_encode_slice.cpp */,
-				4CE4438F18B6FFB80017DF25 /* svc_mode_decision.cpp */,
-				4CE4439018B6FFB80017DF25 /* svc_motion_estimate.cpp */,
-				4CE4439118B6FFB80017DF25 /* svc_set_mb_syn_cavlc.cpp */,
-				4CE4439218B6FFB80017DF25 /* utils.cpp */,
-				4CE4439318B6FFB80017DF25 /* wels_preprocess.cpp */,
+				4CE446AA18BC605C0017DF25 /* as264_common.h */,
+				4CE446AB18BC605C0017DF25 /* au_set.h */,
+				4CE446AC18BC605C0017DF25 /* bit_stream.h */,
+				4CE446AD18BC605C0017DF25 /* bundleloader.h */,
+				4CE446AE18BC605C0017DF25 /* deblocking.h */,
+				4CE446AF18BC605C0017DF25 /* decode_mb_aux.h */,
+				4CE446B018BC605C0017DF25 /* dq_map.h */,
+				4CE446B118BC605C0017DF25 /* encode_mb_aux.h */,
+				4CE446B218BC605C0017DF25 /* encoder.h */,
+				4CE446B318BC605C0017DF25 /* encoder_context.h */,
+				4CE446B418BC605C0017DF25 /* expand_pic.h */,
+				4CE446B518BC605C0017DF25 /* extern.h */,
+				4CE446B618BC605C0017DF25 /* get_intra_predictor.h */,
+				4CE446B718BC605C0017DF25 /* mb_cache.h */,
+				4CE446B818BC605C0017DF25 /* mc.h */,
+				4CE446B918BC605C0017DF25 /* md.h */,
+				4CE446BA18BC605C0017DF25 /* memory_align.h */,
+				4CE446BB18BC605C0017DF25 /* mt_defs.h */,
+				4CE446BC18BC605C0017DF25 /* mv_pred.h */,
+				4CE446BD18BC605C0017DF25 /* nal_encap.h */,
+				4CE446BE18BC605C0017DF25 /* nal_prefix.h */,
+				4CE446BF18BC605C0017DF25 /* param_svc.h */,
+				4CE446C018BC605C0017DF25 /* parameter_sets.h */,
+				4CE446C118BC605C0017DF25 /* picture.h */,
+				4CE446C218BC605C0017DF25 /* picture_handle.h */,
+				4CE446C318BC605C0017DF25 /* property.h */,
+				4CE446C418BC605C0017DF25 /* rc.h */,
+				4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */,
+				4CE446C618BC605C0017DF25 /* sample.h */,
+				4CE446C718BC605C0017DF25 /* set_mb_syn_cavlc.h */,
+				4CE446C818BC605C0017DF25 /* slice.h */,
+				4CE446C918BC605C0017DF25 /* slice_multi_threading.h */,
+				4CE446CA18BC605C0017DF25 /* stat.h */,
+				4CE446CB18BC605C0017DF25 /* svc_base_layer_md.h */,
+				4CE446CC18BC605C0017DF25 /* svc_config.h */,
+				4CE446CD18BC605C0017DF25 /* svc_enc_frame.h */,
+				4CE446CE18BC605C0017DF25 /* svc_enc_golomb.h */,
+				4CE446CF18BC605C0017DF25 /* svc_enc_macroblock.h */,
+				4CE446D018BC605C0017DF25 /* svc_enc_slice_segment.h */,
+				4CE446D118BC605C0017DF25 /* svc_encode_mb.h */,
+				4CE446D218BC605C0017DF25 /* svc_encode_slice.h */,
+				4CE446D318BC605C0017DF25 /* svc_mode_decision.h */,
+				4CE446D418BC605C0017DF25 /* svc_motion_estimate.h */,
+				4CE446D518BC605C0017DF25 /* svc_set_mb_syn_cavlc.h */,
+				4CE446D618BC605C0017DF25 /* utils.h */,
+				4CE446D718BC605C0017DF25 /* vlc_encoder.h */,
+				4CE446D818BC605C0017DF25 /* wels_common_basis.h */,
+				4CE446D918BC605C0017DF25 /* wels_const.h */,
+				4CE446DA18BC605C0017DF25 /* wels_func_ptr_def.h */,
+				4CE446DB18BC605C0017DF25 /* wels_preprocess.h */,
 			);
-			path = src;
+			path = inc;
 			sourceTree = "<group>";
 		};
-		4CE4439418B6FFB80017DF25 /* plus */ = {
+		4CE446DC18BC605C0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4439518B6FFB80017DF25 /* inc */,
-				4CE4439B18B6FFB80017DF25 /* src */,
+				4CE446DD18BC605C0017DF25 /* au_set.cpp */,
+				4CE446DE18BC605C0017DF25 /* deblocking.cpp */,
+				4CE446DF18BC605C0017DF25 /* decode_mb_aux.cpp */,
+				4CE446E018BC605C0017DF25 /* encode_mb_aux.cpp */,
+				4CE446E118BC605C0017DF25 /* encoder.cpp */,
+				4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */,
+				4CE446E318BC605C0017DF25 /* encoder_ext.cpp */,
+				4CE446E418BC605C0017DF25 /* expand_pic.cpp */,
+				4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */,
+				4CE446E618BC605C0017DF25 /* mc.cpp */,
+				4CE446E718BC605C0017DF25 /* md.cpp */,
+				4CE446E818BC605C0017DF25 /* memory_align.cpp */,
+				4CE446E918BC605C0017DF25 /* mv_pred.cpp */,
+				4CE446EA18BC605C0017DF25 /* nal_encap.cpp */,
+				4CE446EB18BC605C0017DF25 /* picture_handle.cpp */,
+				4CE446EC18BC605C0017DF25 /* property.cpp */,
+				4CE446ED18BC605C0017DF25 /* ratectl.cpp */,
+				4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */,
+				4CE446EF18BC605C0017DF25 /* sample.cpp */,
+				4CE446F018BC605C0017DF25 /* set_mb_syn_cavlc.cpp */,
+				4CE446F118BC605C0017DF25 /* slice_multi_threading.cpp */,
+				4CE446F218BC605C0017DF25 /* svc_base_layer_md.cpp */,
+				4CE446F318BC605C0017DF25 /* svc_enc_slice_segment.cpp */,
+				4CE446F418BC605C0017DF25 /* svc_encode_mb.cpp */,
+				4CE446F518BC605C0017DF25 /* svc_encode_slice.cpp */,
+				4CE446F618BC605C0017DF25 /* svc_mode_decision.cpp */,
+				4CE446F718BC605C0017DF25 /* svc_motion_estimate.cpp */,
+				4CE446F818BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp */,
+				4CE446F918BC605C0017DF25 /* utils.cpp */,
+				4CE446FA18BC605C0017DF25 /* wels_preprocess.cpp */,
 			);
-			name = plus;
-			path = ../../../../../encoder/plus;
+			path = src;
 			sourceTree = "<group>";
 		};
-		4CE4439518B6FFB80017DF25 /* inc */ = {
+		4CE446FB18BC605C0017DF25 /* plus */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4439618B6FFB80017DF25 /* welsCodecTrace.h */,
-				4CE4439718B6FFB80017DF25 /* welsEncoderExt.h */,
+				4CE446FC18BC605C0017DF25 /* inc */,
+				4CE4470218BC605C0017DF25 /* src */,
 			);
-			path = inc;
+			path = plus;
 			sourceTree = "<group>";
 		};
-		4CE4439B18B6FFB80017DF25 /* src */ = {
+		4CE446FC18BC605C0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4439D18B6FFB80017DF25 /* wels_enc_export.def */,
-				4CE4439E18B6FFB80017DF25 /* welsCodecTrace.cpp */,
-				4CE4439F18B6FFB80017DF25 /* welsEncoderExt.cpp */,
+				4CE446FD18BC605C0017DF25 /* welsCodecTrace.h */,
+				4CE446FE18BC605C0017DF25 /* welsEncoderExt.h */,
 			);
-			path = src;
+			path = inc;
 			sourceTree = "<group>";
 		};
-		4CE443C718B6FFC70017DF25 /* svc */ = {
+		4CE4470218BC605C0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CE443C818B6FFC70017DF25 /* codec_api.h */,
-				4CE443C918B6FFC70017DF25 /* codec_app_def.h */,
-				4CE443CA18B6FFC70017DF25 /* codec_def.h */,
+				4CE4470418BC605C0017DF25 /* wels_enc_export.def */,
+				4CE4470518BC605C0017DF25 /* welsCodecTrace.cpp */,
+				4CE4470618BC605C0017DF25 /* welsEncoderExt.cpp */,
 			);
-			name = svc;
-			path = ../../../../../api/svc;
+			path = src;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -484,38 +458,38 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CE443B918B6FFB80017DF25 /* set_mb_syn_cavlc.cpp in Sources */,
-				4CE443A918B6FFB80017DF25 /* encode_mb_aux.cpp in Sources */,
-				4CE443BF18B6FFB80017DF25 /* svc_mode_decision.cpp in Sources */,
-				4CE443C018B6FFB80017DF25 /* svc_motion_estimate.cpp in Sources */,
-				4CE443B518B6FFB80017DF25 /* property.cpp in Sources */,
-				4CE443C218B6FFB80017DF25 /* utils.cpp in Sources */,
-				4CE443A818B6FFB80017DF25 /* decode_mb_aux.cpp in Sources */,
-				4CE443B818B6FFB80017DF25 /* sample.cpp in Sources */,
-				4CE443C518B6FFB80017DF25 /* welsCodecTrace.cpp in Sources */,
-				4CE443AB18B6FFB80017DF25 /* encoder_data_tables.cpp in Sources */,
-				4CE443B718B6FFB80017DF25 /* ref_list_mgr_svc.cpp in Sources */,
-				4CE443BA18B6FFB80017DF25 /* slice_multi_threading.cpp in Sources */,
-				4CE443AD18B6FFB80017DF25 /* expand_pic.cpp in Sources */,
-				4CE443A718B6FFB80017DF25 /* deblocking.cpp in Sources */,
-				4CE443BD18B6FFB80017DF25 /* svc_encode_mb.cpp in Sources */,
-				4CE443B218B6FFB80017DF25 /* mv_pred.cpp in Sources */,
-				4CE443C318B6FFB80017DF25 /* wels_preprocess.cpp in Sources */,
-				4CE443A618B6FFB80017DF25 /* au_set.cpp in Sources */,
-				4CE443AF18B6FFB80017DF25 /* mc.cpp in Sources */,
-				4CE443C118B6FFB80017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */,
-				4CE443B018B6FFB80017DF25 /* md.cpp in Sources */,
-				4CE443B318B6FFB80017DF25 /* nal_encap.cpp in Sources */,
-				4CE443B118B6FFB80017DF25 /* memory_align.cpp in Sources */,
-				4CE443BC18B6FFB80017DF25 /* svc_enc_slice_segment.cpp in Sources */,
-				4CE443BB18B6FFB80017DF25 /* svc_base_layer_md.cpp in Sources */,
-				4CE443B618B6FFB80017DF25 /* ratectl.cpp in Sources */,
-				4CE443B418B6FFB80017DF25 /* picture_handle.cpp in Sources */,
-				4CE443BE18B6FFB80017DF25 /* svc_encode_slice.cpp in Sources */,
-				4CE443AA18B6FFB80017DF25 /* encoder.cpp in Sources */,
-				4CE443AE18B6FFB80017DF25 /* get_intra_predictor.cpp in Sources */,
-				4CE443C618B6FFB80017DF25 /* welsEncoderExt.cpp in Sources */,
-				4CE443AC18B6FFB80017DF25 /* encoder_ext.cpp in Sources */,
+				4CE4472118BC605C0017DF25 /* set_mb_syn_cavlc.cpp in Sources */,
+				4CE4471118BC605C0017DF25 /* encode_mb_aux.cpp in Sources */,
+				4CE4472718BC605C0017DF25 /* svc_mode_decision.cpp in Sources */,
+				4CE4472818BC605C0017DF25 /* svc_motion_estimate.cpp in Sources */,
+				4CE4471D18BC605C0017DF25 /* property.cpp in Sources */,
+				4CE4472A18BC605C0017DF25 /* utils.cpp in Sources */,
+				4CE4471018BC605C0017DF25 /* decode_mb_aux.cpp in Sources */,
+				4CE4472018BC605C0017DF25 /* sample.cpp in Sources */,
+				4CE4472D18BC605C0017DF25 /* welsCodecTrace.cpp in Sources */,
+				4CE4471318BC605C0017DF25 /* encoder_data_tables.cpp in Sources */,
+				4CE4471F18BC605C0017DF25 /* ref_list_mgr_svc.cpp in Sources */,
+				4CE4472218BC605C0017DF25 /* slice_multi_threading.cpp in Sources */,
+				4CE4471518BC605C0017DF25 /* expand_pic.cpp in Sources */,
+				4CE4470F18BC605C0017DF25 /* deblocking.cpp in Sources */,
+				4CE4472518BC605C0017DF25 /* svc_encode_mb.cpp in Sources */,
+				4CE4471A18BC605C0017DF25 /* mv_pred.cpp in Sources */,
+				4CE4472B18BC605C0017DF25 /* wels_preprocess.cpp in Sources */,
+				4CE4470E18BC605C0017DF25 /* au_set.cpp in Sources */,
+				4CE4471718BC605C0017DF25 /* mc.cpp in Sources */,
+				4CE4472918BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */,
+				4CE4471818BC605C0017DF25 /* md.cpp in Sources */,
+				4CE4471B18BC605C0017DF25 /* nal_encap.cpp in Sources */,
+				4CE4471918BC605C0017DF25 /* memory_align.cpp in Sources */,
+				4CE4472418BC605C0017DF25 /* svc_enc_slice_segment.cpp in Sources */,
+				4CE4472318BC605C0017DF25 /* svc_base_layer_md.cpp in Sources */,
+				4CE4471E18BC605C0017DF25 /* ratectl.cpp in Sources */,
+				4CE4471C18BC605C0017DF25 /* picture_handle.cpp in Sources */,
+				4CE4472618BC605C0017DF25 /* svc_encode_slice.cpp in Sources */,
+				4CE4471218BC605C0017DF25 /* encoder.cpp in Sources */,
+				4CE4471618BC605C0017DF25 /* get_intra_predictor.cpp in Sources */,
+				4CE4472E18BC605C0017DF25 /* welsEncoderExt.cpp in Sources */,
+				4CE4471418BC605C0017DF25 /* encoder_ext.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -635,10 +609,8 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/../../../../common\"",
-					"\"$(SRCROOT)/../../../../processing/interface\"",
-					"$(SRCROOT)/../../../../encoder/core/inc",
-					"$(SRCROOT)/../../../../encoder/plus/inc",
+					"$(SRCROOT)/../../../../common",
+					"$(SRCROOT)/../../../../processing/interface",
 					"$(SRCROOT)/../../../../api/svc",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
@@ -665,10 +637,8 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/../../../../common\"",
-					"\"$(SRCROOT)/../../../../processing/interface\"",
-					"$(SRCROOT)/../../../../encoder/core/inc",
-					"$(SRCROOT)/../../../../encoder/plus/inc",
+					"$(SRCROOT)/../../../../common",
+					"$(SRCROOT)/../../../../processing/interface",
 					"$(SRCROOT)/../../../../api/svc",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
@@ -736,6 +706,7 @@
 				4CE4433618B6FFA00017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		4CE4433718B6FFA00017DF25 /* Build configuration list for PBXNativeTarget "welsencTests" */ = {
 			isa = XCConfigurationList;
@@ -744,6 +715,7 @@
 				4CE4433918B6FFA00017DF25 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
--- a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
+++ b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
@@ -14,23 +14,23 @@
 		4CE4444918B724B60017DF25 /* libprocessing.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE4443118B724B60017DF25 /* libprocessing.a */; };
 		4CE4444F18B724B60017DF25 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4CE4444D18B724B60017DF25 /* InfoPlist.strings */; };
 		4CE4445118B724B60017DF25 /* processingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4445018B724B60017DF25 /* processingTests.m */; };
-		4CE444D218B726E80017DF25 /* AdaptiveQuantization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444A418B726E70017DF25 /* AdaptiveQuantization.cpp */; };
-		4CE444D618B726E80017DF25 /* BackgroundDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444AB18B726E70017DF25 /* BackgroundDetection.cpp */; };
-		4CE444D718B726E80017DF25 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444AE18B726E70017DF25 /* memory.cpp */; };
-		4CE444D818B726E80017DF25 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444B118B726E70017DF25 /* thread.cpp */; };
-		4CE444D918B726E80017DF25 /* WelsFrameWork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444B518B726E70017DF25 /* WelsFrameWork.cpp */; };
-		4CE444DA18B726E80017DF25 /* WelsFrameWorkEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444B718B726E70017DF25 /* WelsFrameWorkEx.cpp */; };
-		4CE444DB18B726E80017DF25 /* ComplexityAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444BB18B726E70017DF25 /* ComplexityAnalysis.cpp */; };
-		4CE444DC18B726E80017DF25 /* denoise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444BE18B726E70017DF25 /* denoise.cpp */; };
-		4CE444DD18B726E80017DF25 /* denoise_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444C018B726E70017DF25 /* denoise_filter.cpp */; };
-		4CE444DE18B726E80017DF25 /* downsample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444C218B726E70017DF25 /* downsample.cpp */; };
-		4CE444DF18B726E80017DF25 /* downsamplefuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444C418B726E70017DF25 /* downsamplefuncs.cpp */; };
-		4CE444E018B726E80017DF25 /* imagerotate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444C618B726E70017DF25 /* imagerotate.cpp */; };
-		4CE444E118B726E80017DF25 /* imagerotatefuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444C818B726E80017DF25 /* imagerotatefuncs.cpp */; };
-		4CE444E218B726E80017DF25 /* SceneChangeDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444CA18B726E80017DF25 /* SceneChangeDetection.cpp */; };
-		4CE444E318B726E80017DF25 /* SceneChangeDetectionCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444CC18B726E80017DF25 /* SceneChangeDetectionCommon.cpp */; };
-		4CE444E418B726E80017DF25 /* vaacalcfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444CF18B726E80017DF25 /* vaacalcfuncs.cpp */; };
-		4CE444E518B726E80017DF25 /* vaacalculation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE444D018B726E80017DF25 /* vaacalculation.cpp */; };
+		4CE4478B18BC62960017DF25 /* AdaptiveQuantization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4475D18BC62960017DF25 /* AdaptiveQuantization.cpp */; };
+		4CE4478F18BC62960017DF25 /* BackgroundDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4476418BC62960017DF25 /* BackgroundDetection.cpp */; };
+		4CE4479018BC62960017DF25 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4476718BC62960017DF25 /* memory.cpp */; };
+		4CE4479118BC62960017DF25 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4476A18BC62960017DF25 /* thread.cpp */; };
+		4CE4479218BC62960017DF25 /* WelsFrameWork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4476E18BC62960017DF25 /* WelsFrameWork.cpp */; };
+		4CE4479318BC62960017DF25 /* WelsFrameWorkEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477018BC62960017DF25 /* WelsFrameWorkEx.cpp */; };
+		4CE4479418BC62960017DF25 /* ComplexityAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477418BC62960017DF25 /* ComplexityAnalysis.cpp */; };
+		4CE4479518BC62960017DF25 /* denoise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477718BC62960017DF25 /* denoise.cpp */; };
+		4CE4479618BC62960017DF25 /* denoise_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477918BC62960017DF25 /* denoise_filter.cpp */; };
+		4CE4479718BC62960017DF25 /* downsample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477B18BC62960017DF25 /* downsample.cpp */; };
+		4CE4479818BC62960017DF25 /* downsamplefuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477D18BC62960017DF25 /* downsamplefuncs.cpp */; };
+		4CE4479918BC62960017DF25 /* imagerotate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4477F18BC62960017DF25 /* imagerotate.cpp */; };
+		4CE4479A18BC62960017DF25 /* imagerotatefuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4478118BC62960017DF25 /* imagerotatefuncs.cpp */; };
+		4CE4479B18BC62960017DF25 /* SceneChangeDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4478318BC62960017DF25 /* SceneChangeDetection.cpp */; };
+		4CE4479C18BC62960017DF25 /* SceneChangeDetectionCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4478518BC62960017DF25 /* SceneChangeDetectionCommon.cpp */; };
+		4CE4479D18BC62960017DF25 /* vaacalcfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4478818BC62960017DF25 /* vaacalcfuncs.cpp */; };
+		4CE4479E18BC62960017DF25 /* vaacalculation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4478918BC62960017DF25 /* vaacalculation.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -58,7 +58,6 @@
 /* Begin PBXFileReference section */
 		4CE4443118B724B60017DF25 /* libprocessing.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprocessing.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4443418B724B60017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		4CE4443818B724B60017DF25 /* processing-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "processing-Prefix.pch"; sourceTree = "<group>"; };
 		4CE4444118B724B60017DF25 /* processingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = processingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4444218B724B60017DF25 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4CE4444518B724B60017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -65,40 +64,39 @@
 		4CE4444C18B724B60017DF25 /* processingTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "processingTests-Info.plist"; sourceTree = "<group>"; };
 		4CE4444E18B724B60017DF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4CE4445018B724B60017DF25 /* processingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = processingTests.m; sourceTree = "<group>"; };
-		4CE444A118B726E70017DF25 /* IWelsVP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IWelsVP.h; sourceTree = "<group>"; };
-		4CE444A418B726E70017DF25 /* AdaptiveQuantization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdaptiveQuantization.cpp; sourceTree = "<group>"; };
-		4CE444A518B726E70017DF25 /* AdaptiveQuantization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdaptiveQuantization.h; sourceTree = "<group>"; };
-		4CE444AB18B726E70017DF25 /* BackgroundDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackgroundDetection.cpp; sourceTree = "<group>"; };
-		4CE444AC18B726E70017DF25 /* BackgroundDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundDetection.h; sourceTree = "<group>"; };
-		4CE444AE18B726E70017DF25 /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
-		4CE444AF18B726E70017DF25 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
-		4CE444B018B726E70017DF25 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		4CE444B118B726E70017DF25 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread.cpp; sourceTree = "<group>"; };
-		4CE444B218B726E70017DF25 /* thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread.h; sourceTree = "<group>"; };
-		4CE444B318B726E70017DF25 /* typedef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedef.h; sourceTree = "<group>"; };
-		4CE444B418B726E70017DF25 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		4CE444B518B726E70017DF25 /* WelsFrameWork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsFrameWork.cpp; sourceTree = "<group>"; };
-		4CE444B618B726E70017DF25 /* WelsFrameWork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsFrameWork.h; sourceTree = "<group>"; };
-		4CE444B718B726E70017DF25 /* WelsFrameWorkEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsFrameWorkEx.cpp; sourceTree = "<group>"; };
-		4CE444B818B726E70017DF25 /* WelsVP.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WelsVP.def; sourceTree = "<group>"; };
-		4CE444BB18B726E70017DF25 /* ComplexityAnalysis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexityAnalysis.cpp; sourceTree = "<group>"; };
-		4CE444BC18B726E70017DF25 /* ComplexityAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexityAnalysis.h; sourceTree = "<group>"; };
-		4CE444BE18B726E70017DF25 /* denoise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = denoise.cpp; sourceTree = "<group>"; };
-		4CE444BF18B726E70017DF25 /* denoise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = denoise.h; sourceTree = "<group>"; };
-		4CE444C018B726E70017DF25 /* denoise_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = denoise_filter.cpp; sourceTree = "<group>"; };
-		4CE444C218B726E70017DF25 /* downsample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downsample.cpp; sourceTree = "<group>"; };
-		4CE444C318B726E70017DF25 /* downsample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downsample.h; sourceTree = "<group>"; };
-		4CE444C418B726E70017DF25 /* downsamplefuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downsamplefuncs.cpp; sourceTree = "<group>"; };
-		4CE444C618B726E70017DF25 /* imagerotate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagerotate.cpp; sourceTree = "<group>"; };
-		4CE444C718B726E70017DF25 /* imagerotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagerotate.h; sourceTree = "<group>"; };
-		4CE444C818B726E80017DF25 /* imagerotatefuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagerotatefuncs.cpp; sourceTree = "<group>"; };
-		4CE444CA18B726E80017DF25 /* SceneChangeDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneChangeDetection.cpp; sourceTree = "<group>"; };
-		4CE444CB18B726E80017DF25 /* SceneChangeDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneChangeDetection.h; sourceTree = "<group>"; };
-		4CE444CC18B726E80017DF25 /* SceneChangeDetectionCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneChangeDetectionCommon.cpp; sourceTree = "<group>"; };
-		4CE444CD18B726E80017DF25 /* SceneChangeDetectionCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneChangeDetectionCommon.h; sourceTree = "<group>"; };
-		4CE444CF18B726E80017DF25 /* vaacalcfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalcfuncs.cpp; sourceTree = "<group>"; };
-		4CE444D018B726E80017DF25 /* vaacalculation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalculation.cpp; sourceTree = "<group>"; };
-		4CE444D118B726E80017DF25 /* vaacalculation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vaacalculation.h; sourceTree = "<group>"; };
+		4CE4475A18BC62960017DF25 /* IWelsVP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IWelsVP.h; sourceTree = "<group>"; };
+		4CE4475D18BC62960017DF25 /* AdaptiveQuantization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdaptiveQuantization.cpp; sourceTree = "<group>"; };
+		4CE4475E18BC62960017DF25 /* AdaptiveQuantization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdaptiveQuantization.h; sourceTree = "<group>"; };
+		4CE4476418BC62960017DF25 /* BackgroundDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackgroundDetection.cpp; sourceTree = "<group>"; };
+		4CE4476518BC62960017DF25 /* BackgroundDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundDetection.h; sourceTree = "<group>"; };
+		4CE4476718BC62960017DF25 /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
+		4CE4476818BC62960017DF25 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
+		4CE4476918BC62960017DF25 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
+		4CE4476A18BC62960017DF25 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread.cpp; sourceTree = "<group>"; };
+		4CE4476B18BC62960017DF25 /* thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread.h; sourceTree = "<group>"; };
+		4CE4476C18BC62960017DF25 /* typedef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedef.h; sourceTree = "<group>"; };
+		4CE4476D18BC62960017DF25 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
+		4CE4476E18BC62960017DF25 /* WelsFrameWork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsFrameWork.cpp; sourceTree = "<group>"; };
+		4CE4476F18BC62960017DF25 /* WelsFrameWork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsFrameWork.h; sourceTree = "<group>"; };
+		4CE4477018BC62960017DF25 /* WelsFrameWorkEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsFrameWorkEx.cpp; sourceTree = "<group>"; };
+		4CE4477418BC62960017DF25 /* ComplexityAnalysis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexityAnalysis.cpp; sourceTree = "<group>"; };
+		4CE4477518BC62960017DF25 /* ComplexityAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexityAnalysis.h; sourceTree = "<group>"; };
+		4CE4477718BC62960017DF25 /* denoise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = denoise.cpp; sourceTree = "<group>"; };
+		4CE4477818BC62960017DF25 /* denoise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = denoise.h; sourceTree = "<group>"; };
+		4CE4477918BC62960017DF25 /* denoise_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = denoise_filter.cpp; sourceTree = "<group>"; };
+		4CE4477B18BC62960017DF25 /* downsample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downsample.cpp; sourceTree = "<group>"; };
+		4CE4477C18BC62960017DF25 /* downsample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downsample.h; sourceTree = "<group>"; };
+		4CE4477D18BC62960017DF25 /* downsamplefuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downsamplefuncs.cpp; sourceTree = "<group>"; };
+		4CE4477F18BC62960017DF25 /* imagerotate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagerotate.cpp; sourceTree = "<group>"; };
+		4CE4478018BC62960017DF25 /* imagerotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagerotate.h; sourceTree = "<group>"; };
+		4CE4478118BC62960017DF25 /* imagerotatefuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagerotatefuncs.cpp; sourceTree = "<group>"; };
+		4CE4478318BC62960017DF25 /* SceneChangeDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneChangeDetection.cpp; sourceTree = "<group>"; };
+		4CE4478418BC62960017DF25 /* SceneChangeDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneChangeDetection.h; sourceTree = "<group>"; };
+		4CE4478518BC62960017DF25 /* SceneChangeDetectionCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneChangeDetectionCommon.cpp; sourceTree = "<group>"; };
+		4CE4478618BC62960017DF25 /* SceneChangeDetectionCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneChangeDetectionCommon.h; sourceTree = "<group>"; };
+		4CE4478818BC62960017DF25 /* vaacalcfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalcfuncs.cpp; sourceTree = "<group>"; };
+		4CE4478918BC62960017DF25 /* vaacalculation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalculation.cpp; sourceTree = "<group>"; };
+		4CE4478A18BC62960017DF25 /* vaacalculation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vaacalculation.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -127,7 +125,8 @@
 		4CE4442818B724B60017DF25 = {
 			isa = PBXGroup;
 			children = (
-				4CE4443618B724B60017DF25 /* processing */,
+				4CE4475918BC62960017DF25 /* interface */,
+				4CE4475B18BC62960017DF25 /* src */,
 				4CE4444A18B724B60017DF25 /* processingTests */,
 				4CE4443318B724B60017DF25 /* Frameworks */,
 				4CE4443218B724B60017DF25 /* Products */,
@@ -153,24 +152,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4CE4443618B724B60017DF25 /* processing */ = {
-			isa = PBXGroup;
-			children = (
-				4CE444A018B726E70017DF25 /* interface */,
-				4CE444A218B726E70017DF25 /* src */,
-				4CE4443718B724B60017DF25 /* Supporting Files */,
-			);
-			path = processing;
-			sourceTree = "<group>";
-		};
-		4CE4443718B724B60017DF25 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				4CE4443818B724B60017DF25 /* processing-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		4CE4444A18B724B60017DF25 /* processingTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -189,124 +170,123 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		4CE444A018B726E70017DF25 /* interface */ = {
+		4CE4475918BC62960017DF25 /* interface */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444A118B726E70017DF25 /* IWelsVP.h */,
+				4CE4475A18BC62960017DF25 /* IWelsVP.h */,
 			);
 			name = interface;
-			path = ../../../interface;
+			path = ../../interface;
 			sourceTree = "<group>";
 		};
-		4CE444A218B726E70017DF25 /* src */ = {
+		4CE4475B18BC62960017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444A318B726E70017DF25 /* adaptivequantization */,
-				4CE444AA18B726E70017DF25 /* backgrounddetection */,
-				4CE444AD18B726E70017DF25 /* common */,
-				4CE444BA18B726E70017DF25 /* complexityanalysis */,
-				4CE444BD18B726E70017DF25 /* denoise */,
-				4CE444C118B726E70017DF25 /* downsample */,
-				4CE444C518B726E70017DF25 /* imagerotate */,
-				4CE444C918B726E80017DF25 /* scenechangedetection */,
-				4CE444CE18B726E80017DF25 /* vaacalc */,
+				4CE4475C18BC62960017DF25 /* adaptivequantization */,
+				4CE4476318BC62960017DF25 /* backgrounddetection */,
+				4CE4476618BC62960017DF25 /* common */,
+				4CE4477318BC62960017DF25 /* complexityanalysis */,
+				4CE4477618BC62960017DF25 /* denoise */,
+				4CE4477A18BC62960017DF25 /* downsample */,
+				4CE4477E18BC62960017DF25 /* imagerotate */,
+				4CE4478218BC62960017DF25 /* scenechangedetection */,
+				4CE4478718BC62960017DF25 /* vaacalc */,
 			);
 			name = src;
-			path = ../../../src;
+			path = ../../src;
 			sourceTree = "<group>";
 		};
-		4CE444A318B726E70017DF25 /* adaptivequantization */ = {
+		4CE4475C18BC62960017DF25 /* adaptivequantization */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444A418B726E70017DF25 /* AdaptiveQuantization.cpp */,
-				4CE444A518B726E70017DF25 /* AdaptiveQuantization.h */,
+				4CE4475D18BC62960017DF25 /* AdaptiveQuantization.cpp */,
+				4CE4475E18BC62960017DF25 /* AdaptiveQuantization.h */,
 			);
 			path = adaptivequantization;
 			sourceTree = "<group>";
 		};
-		4CE444AA18B726E70017DF25 /* backgrounddetection */ = {
+		4CE4476318BC62960017DF25 /* backgrounddetection */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444AB18B726E70017DF25 /* BackgroundDetection.cpp */,
-				4CE444AC18B726E70017DF25 /* BackgroundDetection.h */,
+				4CE4476418BC62960017DF25 /* BackgroundDetection.cpp */,
+				4CE4476518BC62960017DF25 /* BackgroundDetection.h */,
 			);
 			path = backgrounddetection;
 			sourceTree = "<group>";
 		};
-		4CE444AD18B726E70017DF25 /* common */ = {
+		4CE4476618BC62960017DF25 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444AE18B726E70017DF25 /* memory.cpp */,
-				4CE444AF18B726E70017DF25 /* memory.h */,
-				4CE444B018B726E70017DF25 /* resource.h */,
-				4CE444B118B726E70017DF25 /* thread.cpp */,
-				4CE444B218B726E70017DF25 /* thread.h */,
-				4CE444B318B726E70017DF25 /* typedef.h */,
-				4CE444B418B726E70017DF25 /* util.h */,
-				4CE444B518B726E70017DF25 /* WelsFrameWork.cpp */,
-				4CE444B618B726E70017DF25 /* WelsFrameWork.h */,
-				4CE444B718B726E70017DF25 /* WelsFrameWorkEx.cpp */,
-				4CE444B818B726E70017DF25 /* WelsVP.def */,
+				4CE4476718BC62960017DF25 /* memory.cpp */,
+				4CE4476818BC62960017DF25 /* memory.h */,
+				4CE4476918BC62960017DF25 /* resource.h */,
+				4CE4476A18BC62960017DF25 /* thread.cpp */,
+				4CE4476B18BC62960017DF25 /* thread.h */,
+				4CE4476C18BC62960017DF25 /* typedef.h */,
+				4CE4476D18BC62960017DF25 /* util.h */,
+				4CE4476E18BC62960017DF25 /* WelsFrameWork.cpp */,
+				4CE4476F18BC62960017DF25 /* WelsFrameWork.h */,
+				4CE4477018BC62960017DF25 /* WelsFrameWorkEx.cpp */,
 			);
 			path = common;
 			sourceTree = "<group>";
 		};
-		4CE444BA18B726E70017DF25 /* complexityanalysis */ = {
+		4CE4477318BC62960017DF25 /* complexityanalysis */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444BB18B726E70017DF25 /* ComplexityAnalysis.cpp */,
-				4CE444BC18B726E70017DF25 /* ComplexityAnalysis.h */,
+				4CE4477418BC62960017DF25 /* ComplexityAnalysis.cpp */,
+				4CE4477518BC62960017DF25 /* ComplexityAnalysis.h */,
 			);
 			path = complexityanalysis;
 			sourceTree = "<group>";
 		};
-		4CE444BD18B726E70017DF25 /* denoise */ = {
+		4CE4477618BC62960017DF25 /* denoise */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444BE18B726E70017DF25 /* denoise.cpp */,
-				4CE444BF18B726E70017DF25 /* denoise.h */,
-				4CE444C018B726E70017DF25 /* denoise_filter.cpp */,
+				4CE4477718BC62960017DF25 /* denoise.cpp */,
+				4CE4477818BC62960017DF25 /* denoise.h */,
+				4CE4477918BC62960017DF25 /* denoise_filter.cpp */,
 			);
 			path = denoise;
 			sourceTree = "<group>";
 		};
-		4CE444C118B726E70017DF25 /* downsample */ = {
+		4CE4477A18BC62960017DF25 /* downsample */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444C218B726E70017DF25 /* downsample.cpp */,
-				4CE444C318B726E70017DF25 /* downsample.h */,
-				4CE444C418B726E70017DF25 /* downsamplefuncs.cpp */,
+				4CE4477B18BC62960017DF25 /* downsample.cpp */,
+				4CE4477C18BC62960017DF25 /* downsample.h */,
+				4CE4477D18BC62960017DF25 /* downsamplefuncs.cpp */,
 			);
 			path = downsample;
 			sourceTree = "<group>";
 		};
-		4CE444C518B726E70017DF25 /* imagerotate */ = {
+		4CE4477E18BC62960017DF25 /* imagerotate */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444C618B726E70017DF25 /* imagerotate.cpp */,
-				4CE444C718B726E70017DF25 /* imagerotate.h */,
-				4CE444C818B726E80017DF25 /* imagerotatefuncs.cpp */,
+				4CE4477F18BC62960017DF25 /* imagerotate.cpp */,
+				4CE4478018BC62960017DF25 /* imagerotate.h */,
+				4CE4478118BC62960017DF25 /* imagerotatefuncs.cpp */,
 			);
 			path = imagerotate;
 			sourceTree = "<group>";
 		};
-		4CE444C918B726E80017DF25 /* scenechangedetection */ = {
+		4CE4478218BC62960017DF25 /* scenechangedetection */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444CA18B726E80017DF25 /* SceneChangeDetection.cpp */,
-				4CE444CB18B726E80017DF25 /* SceneChangeDetection.h */,
-				4CE444CC18B726E80017DF25 /* SceneChangeDetectionCommon.cpp */,
-				4CE444CD18B726E80017DF25 /* SceneChangeDetectionCommon.h */,
+				4CE4478318BC62960017DF25 /* SceneChangeDetection.cpp */,
+				4CE4478418BC62960017DF25 /* SceneChangeDetection.h */,
+				4CE4478518BC62960017DF25 /* SceneChangeDetectionCommon.cpp */,
+				4CE4478618BC62960017DF25 /* SceneChangeDetectionCommon.h */,
 			);
 			path = scenechangedetection;
 			sourceTree = "<group>";
 		};
-		4CE444CE18B726E80017DF25 /* vaacalc */ = {
+		4CE4478718BC62960017DF25 /* vaacalc */ = {
 			isa = PBXGroup;
 			children = (
-				4CE444CF18B726E80017DF25 /* vaacalcfuncs.cpp */,
-				4CE444D018B726E80017DF25 /* vaacalculation.cpp */,
-				4CE444D118B726E80017DF25 /* vaacalculation.h */,
+				4CE4478818BC62960017DF25 /* vaacalcfuncs.cpp */,
+				4CE4478918BC62960017DF25 /* vaacalculation.cpp */,
+				4CE4478A18BC62960017DF25 /* vaacalculation.h */,
 			);
 			path = vaacalc;
 			sourceTree = "<group>";
@@ -392,23 +372,23 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CE444DE18B726E80017DF25 /* downsample.cpp in Sources */,
-				4CE444D218B726E80017DF25 /* AdaptiveQuantization.cpp in Sources */,
-				4CE444E018B726E80017DF25 /* imagerotate.cpp in Sources */,
-				4CE444DA18B726E80017DF25 /* WelsFrameWorkEx.cpp in Sources */,
-				4CE444D718B726E80017DF25 /* memory.cpp in Sources */,
-				4CE444E118B726E80017DF25 /* imagerotatefuncs.cpp in Sources */,
-				4CE444DC18B726E80017DF25 /* denoise.cpp in Sources */,
-				4CE444D918B726E80017DF25 /* WelsFrameWork.cpp in Sources */,
-				4CE444E218B726E80017DF25 /* SceneChangeDetection.cpp in Sources */,
-				4CE444E418B726E80017DF25 /* vaacalcfuncs.cpp in Sources */,
-				4CE444DF18B726E80017DF25 /* downsamplefuncs.cpp in Sources */,
-				4CE444E318B726E80017DF25 /* SceneChangeDetectionCommon.cpp in Sources */,
-				4CE444DB18B726E80017DF25 /* ComplexityAnalysis.cpp in Sources */,
-				4CE444E518B726E80017DF25 /* vaacalculation.cpp in Sources */,
-				4CE444D818B726E80017DF25 /* thread.cpp in Sources */,
-				4CE444D618B726E80017DF25 /* BackgroundDetection.cpp in Sources */,
-				4CE444DD18B726E80017DF25 /* denoise_filter.cpp in Sources */,
+				4CE4479718BC62960017DF25 /* downsample.cpp in Sources */,
+				4CE4478B18BC62960017DF25 /* AdaptiveQuantization.cpp in Sources */,
+				4CE4479918BC62960017DF25 /* imagerotate.cpp in Sources */,
+				4CE4479318BC62960017DF25 /* WelsFrameWorkEx.cpp in Sources */,
+				4CE4479018BC62960017DF25 /* memory.cpp in Sources */,
+				4CE4479A18BC62960017DF25 /* imagerotatefuncs.cpp in Sources */,
+				4CE4479518BC62960017DF25 /* denoise.cpp in Sources */,
+				4CE4479218BC62960017DF25 /* WelsFrameWork.cpp in Sources */,
+				4CE4479B18BC62960017DF25 /* SceneChangeDetection.cpp in Sources */,
+				4CE4479D18BC62960017DF25 /* vaacalcfuncs.cpp in Sources */,
+				4CE4479818BC62960017DF25 /* downsamplefuncs.cpp in Sources */,
+				4CE4479C18BC62960017DF25 /* SceneChangeDetectionCommon.cpp in Sources */,
+				4CE4479418BC62960017DF25 /* ComplexityAnalysis.cpp in Sources */,
+				4CE4479E18BC62960017DF25 /* vaacalculation.cpp in Sources */,
+				4CE4479118BC62960017DF25 /* thread.cpp in Sources */,
+				4CE4478F18BC62960017DF25 /* BackgroundDetection.cpp in Sources */,
+				4CE4479618BC62960017DF25 /* denoise_filter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};