Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1263 from rivera-ernesto/fix_xcode4_compatibility

Fix Xcode 4 compatibility
  • Loading branch information...
commit 66a223e89045ffff8b9eac7fac549e3960c62a9f 2 parents b662c2e + 94853d6
@BradLarson authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 framework/Source/GPUImageVideoCamera.m
View
4 framework/Source/GPUImageVideoCamera.m
@@ -532,8 +532,10 @@ - (void)setFrameRate:(int32_t)frameRate;
NSError *error;
[_inputCamera lockForConfiguration:&error];
if (error == nil) {
+#if defined(__IPHONE_7_0)
[_inputCamera setActiveVideoMinFrameDuration:CMTimeMake(1, _frameRate)];
[_inputCamera setActiveVideoMaxFrameDuration:CMTimeMake(1, _frameRate)];
+#endif
}
[_inputCamera unlockForConfiguration];
@@ -561,8 +563,10 @@ - (void)setFrameRate:(int32_t)frameRate;
NSError *error;
[_inputCamera lockForConfiguration:&error];
if (error == nil) {
+#if defined(__IPHONE_7_0)
[_inputCamera setActiveVideoMinFrameDuration:kCMTimeInvalid];
[_inputCamera setActiveVideoMaxFrameDuration:kCMTimeInvalid];
+#endif
}
[_inputCamera unlockForConfiguration];
Please sign in to comment.
Something went wrong with that request. Please try again.