Title: [109715] releases/WebKitGTK/webkit-1.8/Source/WebCore
- Revision
- 109715
- Author
- mrobin...@webkit.org
- Date
- 2012-03-05 00:08:16 -0800 (Mon, 05 Mar 2012)
Log Message
Merging r109580
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (109714 => 109715)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-05 08:07:08 UTC (rev 109714)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-05 08:08:16 UTC (rev 109715)
@@ -1,3 +1,17 @@
+2012-03-05 Philippe Normand <pnorm...@igalia.com>
+
+ [GStreamer] media/media-can-play-flac-audio.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=80124
+
+ Reviewed by Martin Robinson.
+
+ Handle audio/x-flac in the mimeTypeCache() function so that we
+ advertize both audio/flac and audio/x-flac.
+
+ No new tests, this is covered already by media/media-can-play-flac-audio.html.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+
2012-03-05 Pablo Flouret <pab...@motorola.com>
Fix code generators to correctly guard header declarations that have a [Conditional] attribute.
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (109714 => 109715)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-03-05 08:07:08 UTC (rev 109714)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-03-05 08:08:16 UTC (rev 109715)
@@ -1535,6 +1535,12 @@
cached = true;
}
+ if (g_str_equal(name, "audio/x-flac")) {
+ cache.add(String("audio/flac"));
+ cache.add(String("audio/x-flac"));
+ cached = true;
+ }
+
if (g_str_equal(name, "audio/mpeg")) {
cache.add(String(name));
cache.add(String("audio/x-mpeg"));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
