Merge remote-tracking branch 'origin/develop' into public_rooms_search

Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
This commit is contained in:
manuroe
2015-12-21 10:35:48 +01:00
parent 92e0fdbe92
commit 68fd187509
64 changed files with 2452 additions and 1112 deletions
@@ -731,14 +731,8 @@ NSString* const recentItemCollectionViewCellId = @"recentItemCollectionViewCellI
AVCaptureConnection *connection = [movieFileOutput connectionWithMediaType:AVMediaTypeVideo];
if ([connection isVideoStabilizationSupported])
{
if ([connection respondsToSelector:@selector(setPreferredVideoStabilizationMode:)])
{
[connection setPreferredVideoStabilizationMode:YES];
}
else
{
[connection setEnablesVideoStabilizationWhenAvailable:YES];
}
// Available on iOS 8 and later
[connection setPreferredVideoStabilizationMode:YES];
}
}
[movieFileOutput addObserver:self forKeyPath:@"recording" options:(NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew) context:RecordingContext];