[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bcd20307ebbb6341f57e621329b7969d8790e59e
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 13:14:48 2010 +0000

    2010-12-23  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] media/audio-data-url.html fails since r75504
            https://bugs.webkit.org/show_bug.cgi?id=51525
    
            Make the GStreamer media-player advertize 3gpp mime-types as
            supported if the 3gp caps are in the typefind factories.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f46b998..5af04ed 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-23  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] media/audio-data-url.html fails since r75504
+        https://bugs.webkit.org/show_bug.cgi?id=51525
+
+        Make the GStreamer media-player advertize 3gpp mime-types as
+        supported if the 3gp caps are in the typefind factories.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache):
+
 2010-12-23  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 3cddd2e..1cf6cd7 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1332,7 +1332,6 @@ static HashSet<String> mimeTypeCache()
         // GStreamer.
         HashSet<String> handledApplicationSubtypes;
         handledApplicationSubtypes.add(String("ogg"));
-        handledApplicationSubtypes.add(String("x-3gp"));
         handledApplicationSubtypes.add(String("vnd.rn-realmedia"));
         handledApplicationSubtypes.add(String("x-pn-realaudio"));
 
@@ -1360,6 +1359,13 @@ static HashSet<String> mimeTypeCache()
                     cached = true;
                 }
 
+                if (g_str_equal(name, "application/x-3gp")) {
+                    cache.add(String("audio/3gpp"));
+                    cache.add(String("video/3gpp"));
+                    cache.add(String("application/x-3gp"));
+                    cached = true;
+                }
+
                 if (g_str_equal(name, "video/x-theora")) {
                     cache.add(String("video/ogg"));
                     cached = true;

-- 
WebKit Debian packaging