Title: [139615] trunk/Source/WebCore
- Revision
- 139615
- Author
- [email protected]
- Date
- 2013-01-14 08:33:45 -0800 (Mon, 14 Jan 2013)
Log Message
Do not pass nil when initializing legible output
https://bugs.webkit.org/show_bug.cgi?id=106799
Reviewed by Jessie Berlin.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): -[AVPlayerItemLegibleOutput initWithDependencyFactory:mediaSubtypesForNativeRepresentation:]
wants an empty NSArray rather than nil.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139614 => 139615)
--- trunk/Source/WebCore/ChangeLog 2013-01-14 15:37:40 UTC (rev 139614)
+++ trunk/Source/WebCore/ChangeLog 2013-01-14 16:33:45 UTC (rev 139615)
@@ -1,3 +1,14 @@
+2013-01-14 Eric Carlson <[email protected]>
+
+ Do not pass nil when initializing legible output
+ https://bugs.webkit.org/show_bug.cgi?id=106799
+
+ Reviewed by Jessie Berlin.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): -[AVPlayerItemLegibleOutput initWithDependencyFactory:mediaSubtypesForNativeRepresentation:]
+ wants an empty NSArray rather than nil.
+
2013-01-14 Andrey Adaikin <[email protected]>
Web Inspector: [Canvas] UI: add control buttons for doing the replay steps
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (139614 => 139615)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-01-14 15:37:40 UTC (rev 139614)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-01-14 16:33:45 UTC (rev 139615)
@@ -888,7 +888,7 @@
#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
if (m_avPlayerItem && !m_legibleOutput) {
- m_legibleOutput = adoptNS([[AVPlayerItemLegibleOutput alloc] initWithMediaSubtypesForNativeRepresentation:nil]);
+ m_legibleOutput = adoptNS([[AVPlayerItemLegibleOutput alloc] initWithMediaSubtypesForNativeRepresentation:[NSArray array]]);
[m_legibleOutput.get() setSuppressesPlayerRendering:YES];
// We enabled automatic media selection because we want alternate audio tracks to be enabled/disabled automatically,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes