Title: [168824] branches/safari-538.34-branch/Source/WebCore
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168823 => 168824)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:06:12 UTC (rev 168823)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:08:14 UTC (rev 168824)
@@ -1,5 +1,16 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168758
+
+ 2014-05-13 Eric Carlson <[email protected]>
+
+ Unreviewed build fix after r168755.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168755
2014-05-13 Eric Carlson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (168823 => 168824)
--- branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-14 09:06:12 UTC (rev 168823)
+++ branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-14 09:08:14 UTC (rev 168824)
@@ -2398,7 +2398,7 @@
{
m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(%p) - adding %i cues at time %.2f", this, m_currentMetaData ? static_cast<int>[m_currentMetaData.get() count] : 0, mediaTime);
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(%p) - adding %i cues at time %.2f", this, m_currentMetaData ? static_cast<int>([m_currentMetaData.get() count]) : 0, mediaTime);
#if ENABLE(DATACUE_VALUE)
if (seeking())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
