avcapture: fix compilation for older clang releases
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 18 Aug 2014 20:45:19 +0000 (22:45 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 18 Aug 2014 21:23:58 +0000 (23:23 +0200)
modules/access/avcapture.m

index 18c50e7..730c6bd 100644 (file)
@@ -297,7 +297,7 @@ static int Open(vlc_object_t *p_this)
     {
         AVCaptureDevice *avf_device;
         avf_device = [myVideoDevices objectAtIndex:ivideo];
     {
         AVCaptureDevice *avf_device;
         avf_device = [myVideoDevices objectAtIndex:ivideo];
-        msg_Dbg(p_demux, "avcapture %lu/%lu %s %s", ivideo, deviceCount, [[avf_device modelID] UTF8String], [[avf_device uniqueID] UTF8String]);
+        msg_Dbg(p_demux, "avcapture %i/%i %s %s", ivideo, deviceCount, [[avf_device modelID] UTF8String], [[avf_device uniqueID] UTF8String]);
         if ([[[avf_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:avf_currdevice_uid]) {
             break;
         }
         if ([[[avf_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:avf_currdevice_uid]) {
             break;
         }
@@ -350,7 +350,7 @@ static int Open(vlc_object_t *p_this)
     [p_sys->output setSampleBufferDelegate:(id)p_sys->output queue:queue];
     dispatch_release(queue);
 
     [p_sys->output setSampleBufferDelegate:(id)p_sys->output queue:queue];
     dispatch_release(queue);
 
-    p_sys->output.videoSettings = [NSDictionary dictionaryWithObject:@(kCVPixelFormatType_32BGRA) forKey:(id)kCVPixelBufferPixelFormatTypeKey];
+    p_sys->output.videoSettings = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey];
     [p_sys->session startRunning];
 
     [input release];
     [p_sys->session startRunning];
 
     [input release];