Title: [128964] trunk/Source/WebCore
- Revision
- 128964
- Author
- eric.carl...@apple.com
- Date
- 2012-09-18 21:21:50 -0700 (Tue, 18 Sep 2012)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128963 => 128964)
--- trunk/Source/WebCore/ChangeLog 2012-09-19 03:39:04 UTC (rev 128963)
+++ trunk/Source/WebCore/ChangeLog 2012-09-19 04:21:50 UTC (rev 128964)
@@ -1,3 +1,16 @@
+2012-09-18 Eric Carlson <eric.carl...@apple.com>
+
+ 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-09-18 Sailesh Agrawal <s...@chromium.org>
Chromium: Scrollbar with tickmarks doesn't respond to clicks
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (128963 => 128964)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-09-19 03:39:04 UTC (rev 128963)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-09-19 04:21:50 UTC (rev 128964)
@@ -210,7 +210,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes