[vlc-commits] avcapture: fix compilation for older clang releases
Felix Paul Kühne
git at videolan.org
Mon Aug 18 23:55:12 CEST 2014
vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 18 22:45:19 2014 +0200| [56deef0741efefca910a4c124627a6fd81212f64] | committer: Jean-Baptiste Kempf
avcapture: fix compilation for older clang releases
(cherry picked from commit 6b3d8f333d915b99e4304c41401fb3840671cb89)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=56deef0741efefca910a4c124627a6fd81212f64
---
modules/access/avcapture.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index 18c50e7..730c6bd 100644
--- 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];
More information about the vlc-commits
mailing list