Commit bd3b4ab0 authored by jer.noble@apple.com's avatar jer.noble@apple.com
Browse files

Unreviewed build fix; make OSStatus the explicit return type for CMTimebase functions.

* platform/mac/PlatformClockCM.mm:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0492744b
2012-02-07 Jer Noble <jer.noble@apple.com>
Unreviewed build fix; make OSStatus the explicit return type for CMTimebase functions.
* platform/mac/PlatformClockCM.mm:
2012-02-07 James Robinson <jamesr@chromium.org> 2012-02-07 James Robinson <jamesr@chromium.org>
   
[chromium] Allow retaining texture across frames in composited video playback and correctly handle lost context [chromium] Allow retaining texture across frames in composited video playback and correctly handle lost context
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia) SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, int32_t, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut)) SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut))
SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, int32_t, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut)) SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))
SOFT_LINK(CoreMedia, CMTimebaseSetTime, int32_t, (CMTimebaseRef timebase, CMTime time), (timebase, time)) SOFT_LINK(CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time))
SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase)) SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
SOFT_LINK(CoreMedia, CMTimebaseSetRate, int32_t, (CMTimebaseRef timebase, Float64 rate), (timebase, rate)) SOFT_LINK(CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
SOFT_LINK(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale)) SOFT_LINK(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time)) SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment