Title: [171678] trunk/Source/WebCore
- Revision
- 171678
- Author
- bfulg...@apple.com
- Date
- 2014-07-28 09:02:03 -0700 (Mon, 28 Jul 2014)
Log Message
Unreviewed 'merge' fix.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
Correct line endings to allow EWS merges again.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171677 => 171678)
--- trunk/Source/WebCore/ChangeLog 2014-07-28 15:05:14 UTC (rev 171677)
+++ trunk/Source/WebCore/ChangeLog 2014-07-28 16:02:03 UTC (rev 171678)
@@ -1,3 +1,10 @@
+2014-07-28 Brent Fulgham <bfulg...@apple.com>
+
+ Unreviewed 'merge' fix.
+
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ Correct line endings to allow EWS merges again.
+
2014-07-28 Zoltan Horvath <zol...@webkit.org>
[CSS3-Text] Adjust text-justify implementation to the latest spec
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (171677 => 171678)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2014-07-28 15:05:14 UTC (rev 171677)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2014-07-28 16:02:03 UTC (rev 171678)
@@ -76,24 +76,22 @@
typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef;
typedef struct opaqueCMSampleBuffer* CMSampleBufferRef;
-#ifndef CMSAMPLEBUFFER_H
-extern "C" {
+#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;
+ typedef struct {
+ int64_t value;
+ int32_t timescale;
+ uint32_t flags;
+ int64_t epoch;
} CMTime;
#endif
- typedef struct
- {
- CMTime duration;
- CMTime presentationTimeStamp;
- CMTime decodeTimeStamp;
+ typedef struct {
+ CMTime duration;
+ CMTime presentationTimeStamp;
+ CMTime decodeTimeStamp;
} CMSampleTimingInfo;
#pragma pack(pop)
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
