Title: [171392] trunk/Source/WebCore
Revision
171392
Author
bfulg...@apple.com
Date
2014-07-22 21:40:55 -0700 (Tue, 22 Jul 2014)

Log Message

[Win] Build fix for Windows bots

* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Provide missing
structure definition when needed by bot.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (171391 => 171392)


--- trunk/Source/WebCore/ChangeLog	2014-07-23 04:33:37 UTC (rev 171391)
+++ trunk/Source/WebCore/ChangeLog	2014-07-23 04:40:55 UTC (rev 171392)
@@ -1,5 +1,12 @@
 2014-07-22  Brent Fulgham  <bfulg...@apple.com>
 
+        [Win] Build fix for Windows bots
+
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Provide missing
+        structure definition when needed by bot.
+
+2014-07-22  Brent Fulgham  <bfulg...@apple.com>
+
         [Win] Build fix for EWS bots.
 
         * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Forward declare

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (171391 => 171392)


--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp	2014-07-23 04:33:37 UTC (rev 171391)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp	2014-07-23 04:40:55 UTC (rev 171392)
@@ -75,7 +75,30 @@
 typedef struct OpaqueCMBlockBuffer* CMBlockBufferRef;
 typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef;
 typedef struct opaqueCMSampleBuffer* CMSampleBufferRef;
-typedef struct CMSampleTimingInfo;
+
+#ifndef CMSAMPLEBUFFER_H
+extern "C" {
+#pragma pack(push, 4)
+#ifndef CMTIME_H
+    typedef struct
+    {
+        int64_t value;
+        int32_t timescale;
+        uint32_t flags;
+        int64_t epoch;
+    } CMTime;
+#endif
+
+    typedef struct
+    {
+        CMTime duration;
+        CMTime presentationTimeStamp;
+        CMTime decodeTimeStamp;
+    } CMSampleTimingInfo;
+#pragma pack(pop)
+}
+#endif
+
 SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeGetSeconds, Float64, __cdecl, (CMTime time), (time))
 #define CMTimeGetSeconds softLink_CMTimeGetSeconds
 SOFT_LINK_DLL_IMPORT(CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, __cdecl, (CMSampleBufferRef sbuf), (sbuf))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to