[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit cf0c847fcc5bc09d98ce0b44a829a5026bf7ef9f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 12:50:59 2009 +0000

    2009-10-06  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] segfault when calling gst_video_format_parse_caps in the video sink
            https://bugs.webkit.org/show_bug.cgi?id=30120
    
            Fix use of gst_video_format_parse_caps()
    
            * platform/graphics/gtk/VideoSinkGStreamer.cpp:
            (webkit_video_sink_idle_func):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9fc4f0b..bc61960 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-06  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] segfault when calling gst_video_format_parse_caps in the video sink
+        https://bugs.webkit.org/show_bug.cgi?id=30120
+
+        Fix use of gst_video_format_parse_caps()
+
+        * platform/graphics/gtk/VideoSinkGStreamer.cpp:
+        (webkit_video_sink_idle_func):
+
 2009-10-06  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
index bb269cd..fb86fe9 100644
--- a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
@@ -112,7 +112,7 @@ webkit_video_sink_idle_func(gpointer data)
     WebKitVideoSinkPrivate* priv = sink->priv;
     GstBuffer* buffer;
     GstCaps* caps;
-    GstVideoFormat* format;
+    GstVideoFormat format;
     gint par_n, par_d;
     gfloat par;
     gint bwidth, bheight;
@@ -125,7 +125,7 @@ webkit_video_sink_idle_func(gpointer data)
         return FALSE;
 
     caps = GST_BUFFER_CAPS(buffer);
-    if (!gst_video_format_parse_caps(caps, format, &bwidth, &bheight)) {
+    if (!gst_video_format_parse_caps(caps, &format, &bwidth, &bheight)) {
         GST_ERROR_OBJECT(sink, "Unknown video format in buffer caps '%s'",
                          gst_caps_to_string(caps));
         return FALSE;

-- 
WebKit Debian packaging