shithub: openh264

Download patch

ref: 666e5d1290ff7bf0bdd7e152fadbdfc52e2f41cb
parent: 0c12c4b21beed6c903edbfd2b13bdb67ca7770e0
parent: 9714e97fbebff8ea24b6e90b28174ec6985543dd
author: ruil2 <[email protected]>
date: Mon Mar 31 10:14:14 EDT 2014 

Merge pull request #601 from volvet/fix-ios-build

fix ios encDemo build


--- a/codec/build/iOS/common/common.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/common/common.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		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 */; };
+		FAABAA1818E9354A00D4186F /* sad_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAABAA1718E9354A00D4186F /* sad_common.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -77,6 +78,8 @@
 		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>"; };
+		FAABAA1618E9353F00D4186F /* sad_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sad_common.h; sourceTree = "<group>"; };
+		FAABAA1718E9354A00D4186F /* sad_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sad_common.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -116,6 +119,7 @@
 		4C3406B618D96EA600DFA14A /* inc */ = {
 			isa = PBXGroup;
 			children = (
+				FAABAA1618E9353F00D4186F /* sad_common.h */,
 				4C3406B718D96EA600DFA14A /* cpu.h */,
 				4C3406B818D96EA600DFA14A /* cpu_core.h */,
 				4C3406B918D96EA600DFA14A /* crt_util_safe_x.h */,
@@ -135,6 +139,7 @@
 		4C3406C318D96EA600DFA14A /* src */ = {
 			isa = PBXGroup;
 			children = (
+				FAABAA1718E9354A00D4186F /* sad_common.cpp */,
 				4C3406C418D96EA600DFA14A /* cpu.cpp */,
 				4C3406C518D96EA600DFA14A /* crt_util_safe_x.cpp */,
 				4C3406C618D96EA600DFA14A /* deblocking_common.cpp */,
@@ -292,6 +297,7 @@
 				4C3406CB18D96EA600DFA14A /* expand_picture_neon.S in Sources */,
 				4C3406CD18D96EA600DFA14A /* cpu.cpp in Sources */,
 				4C3406CA18D96EA600DFA14A /* deblocking_neon.S in Sources */,
+				FAABAA1818E9354A00D4186F /* sad_common.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
+++ b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
@@ -31,9 +31,9 @@
 		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 */; };
+		FAABAA1B18E93DCB00D4186F /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAABAA1918E93DCB00D4186F /* common.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,11 +97,11 @@
 		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>"; };
+		FAABAA1918E93DCB00D4186F /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
+		FAABAA1A18E93DCB00D4186F /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -234,6 +234,8 @@
 		4CE4476618BC62960017DF25 /* common */ = {
 			isa = PBXGroup;
 			children = (
+				FAABAA1918E93DCB00D4186F /* common.cpp */,
+				FAABAA1A18E93DCB00D4186F /* common.h */,
 				4CE4476718BC62960017DF25 /* memory.cpp */,
 				4CE4476818BC62960017DF25 /* memory.h */,
 				4CE4476918BC62960017DF25 /* resource.h */,
@@ -290,8 +292,6 @@
 			children = (
 				4CE4478318BC62960017DF25 /* SceneChangeDetection.cpp */,
 				4CE4478418BC62960017DF25 /* SceneChangeDetection.h */,
-				4CE4478518BC62960017DF25 /* SceneChangeDetectionCommon.cpp */,
-				4CE4478618BC62960017DF25 /* SceneChangeDetectionCommon.h */,
 			);
 			path = scenechangedetection;
 			sourceTree = "<group>";
@@ -391,6 +391,7 @@
 				4C34067818C5A4AD00DFA14A /* adaptive_quantization.S in Sources */,
 				4CE4479718BC62960017DF25 /* downsample.cpp in Sources */,
 				4CE4478B18BC62960017DF25 /* AdaptiveQuantization.cpp in Sources */,
+				FAABAA1B18E93DCB00D4186F /* common.cpp in Sources */,
 				4CE4479918BC62960017DF25 /* imagerotate.cpp in Sources */,
 				4CE4479318BC62960017DF25 /* WelsFrameWorkEx.cpp in Sources */,
 				4CE4479018BC62960017DF25 /* memory.cpp in Sources */,
@@ -401,7 +402,6 @@
 				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 */,
 				4C34067A18C5A4AD00DFA14A /* pixel_sad_neon.S in Sources */,