Title: [152892] releases/WebKitGTK/webkit-2.0/Source/WebCore
Revision
152892
Author
[email protected]
Date
2013-07-19 03:26:11 -0700 (Fri, 19 Jul 2013)

Log Message

Merge r149543 - [GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
https://bugs.webkit.org/show_bug.cgi?id=115575

Patch by Xabier Rodriguez Calvar <[email protected]> on 2013-05-03
Reviewed by Philippe Normand.

No new tests needed.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
Using extern debug category.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
Declaring debug category as not static.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (152891 => 152892)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-07-19 10:19:44 UTC (rev 152891)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-07-19 10:26:11 UTC (rev 152892)
@@ -1,3 +1,17 @@
+2013-05-03  Xabier Rodriguez Calvar  <[email protected]>
+
+        [GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
+        https://bugs.webkit.org/show_bug.cgi?id=115575
+
+        Reviewed by Philippe Normand.
+
+        No new tests needed.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        Using extern debug category.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        Declaring debug category as not static.
+
 2013-04-10  Xabier Rodriguez Calvar  <[email protected]>
 
         Clicking on the volume slider of HTML5 elements is pausing sometimes

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (152891 => 152892)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-07-19 10:19:44 UTC (rev 152891)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-07-19 10:26:11 UTC (rev 152892)
@@ -74,7 +74,7 @@
 static const gint64 gPercentMax = 100;
 #endif
 
-GST_DEBUG_CATEGORY_STATIC(webkit_media_player_debug);
+GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
 #define GST_CAT_DEFAULT webkit_media_player_debug
 
 using namespace std;

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (152891 => 152892)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2013-07-19 10:19:44 UTC (rev 152891)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2013-07-19 10:26:11 UTC (rev 152892)
@@ -51,7 +51,7 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
-GST_DEBUG_CATEGORY_STATIC(webkit_media_player_debug);
+GST_DEBUG_CATEGORY(webkit_media_player_debug);
 #define GST_CAT_DEFAULT webkit_media_player_debug
 
 using namespace std;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to