2008-01-19 Alp Toker <alp@atoker.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jan 2008 04:49:11 +0000 (04:49 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jan 2008 04:49:11 +0000 (04:49 +0000)
        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=16944
        Use of GST_PLUGIN_DEFINE_STATIC results in a module-level constructor

        http://bugzilla.gnome.org/show_bug.cgi?id=510547
        Epiphany/Webkit fails to start due to initializing threads twice

        Don't call GST_PLUGIN_DEFINE_STATIC() as it performs g_thread_init()
        in the global initializer, breaking subsequent calls to
        g_thread_init() in applications.

        * platform/graphics/gtk/VideoSinkGStreamer.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29675 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp

index 33d50a0f03e150a24fc754f0d99fb530416650f1..30e85553d9d7dab04ac0f9f17dd08fe7f779a557 100644 (file)
@@ -1,3 +1,19 @@
+2008-01-19  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16944
+        Use of GST_PLUGIN_DEFINE_STATIC results in a module-level constructor
+
+        http://bugzilla.gnome.org/show_bug.cgi?id=510547
+        Epiphany/Webkit fails to start due to initializing threads twice
+
+        Don't call GST_PLUGIN_DEFINE_STATIC() as it performs g_thread_init()
+        in the global initializer, breaking subsequent calls to
+        g_thread_init() in applications.
+
+        * platform/graphics/gtk/VideoSinkGStreamer.cpp:
+
 2008-01-19  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.
 2008-01-19  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.
index e90be2b9e3f8ff578775a07a509c1dd87252e910..7e976883ae1e7d1d72db5ae5fb1bd4882342e50b 100644 (file)
@@ -312,24 +312,3 @@ webkit_video_sink_set_surface(WebKitVideoSink* sink, cairo_surface_t* surface)
         cairo_surface_destroy(priv->surface);
     priv->surface = cairo_surface_reference(surface);
 }
         cairo_surface_destroy(priv->surface);
     priv->surface = cairo_surface_reference(surface);
 }
-
-static gboolean
-plugin_init(GstPlugin* plugin)
-{
-    return gst_element_register(plugin, "webkitsink", GST_RANK_PRIMARY, WEBKIT_TYPE_VIDEO_SINK);
-}
-
-#define VERSION "0.1"
-#define PACKAGE "webkit"
-
-GST_PLUGIN_DEFINE_STATIC(
-    GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "webkitsink",
-    "Element to render to WebKit Cairo surfaces",
-    plugin_init,
-    VERSION,
-    "LGPL", /* license */
-    PACKAGE,
-    ""
-);