android_window: check subtitles bounds

[vlc] / modules / access / avcapture.m

diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index 18c50e790d4f5f7f2831f5101c3b724a124c81e3..730c6bd9987c74267b223123c4a6d16d5532f124 100644 (file)
--- a/modules/access/avcapture.m
+++ b/modules/access/avcapture.m
@@ -297,7 +297,7 @@ static int Open(vlc_object_t *p_this)
     {
         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;
         }
@@ -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.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];