Merge pull request #7029 from wolever:master

This commit is contained in:
Vadim Pisarevsky 2016-08-04 13:34:55 +00:00
commit d67e6f5cc9

View File

@ -100,6 +100,10 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
- (void)start; - (void)start;
{ {
if (self.running == YES) {
return;
}
recordingCountDown = 10; recordingCountDown = 10;
[super start]; [super start];
@ -118,6 +122,10 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
- (void)stop; - (void)stop;
{ {
if (self.running == NO) {
return;
}
[super stop]; [super stop];
self.videoDataOutput = nil; self.videoDataOutput = nil;