Title: [133709] branches/safari-536.28-branch/Source/WebCore
- Revision
- 133709
- Author
- [email protected]
- Date
- 2012-11-06 18:36:36 -0800 (Tue, 06 Nov 2012)
Log Message
Merged r128964. <rdar://problem/12516360>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (133708 => 133709)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-07 02:31:55 UTC (rev 133708)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-07 02:36:36 UTC (rev 133709)
@@ -1,5 +1,22 @@
2012-11-06 Lucas Forschler <[email protected]>
+ Merge r128964
+
+ 2012-09-18 Eric Carlson <[email protected]>
+
+ Check settings before registering AVFoundation media engine.
+ https://bugs.webkit.org/show_bug.cgi?id=97048
+ <rdar://problem/12313594>
+
+ Reviewed by Dan Bernstein.
+
+ Fix the bug introduced in r122676.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::installedMediaEngines): Uncomment the call to check AVFoundation settings.
+
+2012-11-06 Lucas Forschler <[email protected]>
+
Merge r128654
2012-09-14 Tom Sepez <[email protected]>
@@ -206869,3 +206886,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (133708 => 133709)
--- branches/safari-536.28-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-11-07 02:31:55 UTC (rev 133708)
+++ branches/safari-536.28-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-11-07 02:36:36 UTC (rev 133709)
@@ -206,7 +206,7 @@
enginesQueried = true;
#if USE(AVFOUNDATION)
- if (1 /* @@Settings::isAVFoundationEnabled() @@ */) {
+ if (Settings::isAVFoundationEnabled()) {
#if PLATFORM(MAC)
MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
#elif PLATFORM(WIN)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
