shithub: openh264

Download patch

ref: 786640e176a0a13f578dc407060a7fd022206777
parent: 471816d3fcb009dcad6e1e3e34bdbecfd0aef733
parent: 42bd7227aa57a317660e51da279fa82d92b99272
author: Licai Guo <licaguo@cisco.com>
date: Fri Apr 11 09:21:44 EDT 2014

Merge pull request #665 from volvet/fix_ios_build

fix ios build

--- a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
+++ b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
@@ -34,6 +34,8 @@
 		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 */; };
+		FAC77EA318F7B09C0038A4E4 /* ScrollDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC77E9F18F7B09C0038A4E4 /* ScrollDetection.cpp */; };
+		FAC77EA418F7B09C0038A4E4 /* ScrollDetectionFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC77EA118F7B09C0038A4E4 /* ScrollDetectionFuncs.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -102,6 +104,10 @@
 		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>"; };
+		FAC77E9F18F7B09C0038A4E4 /* ScrollDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollDetection.cpp; sourceTree = "<group>"; };
+		FAC77EA018F7B09C0038A4E4 /* ScrollDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollDetection.h; sourceTree = "<group>"; };
+		FAC77EA118F7B09C0038A4E4 /* ScrollDetectionFuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollDetectionFuncs.cpp; sourceTree = "<group>"; };
+		FAC77EA218F7B09C0038A4E4 /* ScrollDetectionFuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollDetectionFuncs.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -198,6 +204,7 @@
 		4CE4475B18BC62960017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				FAC77E9E18F7B09C0038A4E4 /* scrolldetection */,
 				4C34067318C5A4AD00DFA14A /* arm */,
 				4CE4475C18BC62960017DF25 /* adaptivequantization */,
 				4CE4476318BC62960017DF25 /* backgrounddetection */,
@@ -306,6 +313,17 @@
 			path = vaacalc;
 			sourceTree = "<group>";
 		};
+		FAC77E9E18F7B09C0038A4E4 /* scrolldetection */ = {
+			isa = PBXGroup;
+			children = (
+				FAC77E9F18F7B09C0038A4E4 /* ScrollDetection.cpp */,
+				FAC77EA018F7B09C0038A4E4 /* ScrollDetection.h */,
+				FAC77EA118F7B09C0038A4E4 /* ScrollDetectionFuncs.cpp */,
+				FAC77EA218F7B09C0038A4E4 /* ScrollDetectionFuncs.h */,
+			);
+			path = scrolldetection;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -393,6 +411,7 @@
 				4CE4478B18BC62960017DF25 /* AdaptiveQuantization.cpp in Sources */,
 				FAABAA1B18E93DCB00D4186F /* common.cpp in Sources */,
 				4CE4479918BC62960017DF25 /* imagerotate.cpp in Sources */,
+				FAC77EA418F7B09C0038A4E4 /* ScrollDetectionFuncs.cpp in Sources */,
 				4CE4479318BC62960017DF25 /* WelsFrameWorkEx.cpp in Sources */,
 				4CE4479018BC62960017DF25 /* memory.cpp in Sources */,
 				4CE4479A18BC62960017DF25 /* imagerotatefuncs.cpp in Sources */,
@@ -401,6 +420,7 @@
 				4C34067B18C5A4AD00DFA14A /* vaa_calc_neon.S in Sources */,
 				4CE4479B18BC62960017DF25 /* SceneChangeDetection.cpp in Sources */,
 				4CE4479D18BC62960017DF25 /* vaacalcfuncs.cpp in Sources */,
+				FAC77EA318F7B09C0038A4E4 /* ScrollDetection.cpp in Sources */,
 				4CE4479818BC62960017DF25 /* downsamplefuncs.cpp in Sources */,
 				4CE4479418BC62960017DF25 /* ComplexityAnalysis.cpp in Sources */,
 				4CE4479E18BC62960017DF25 /* vaacalculation.cpp in Sources */,