Title: [178274] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 178274
- Author
- carlo...@webkit.org
- Date
- 2015-01-12 09:56:00 -0800 (Mon, 12 Jan 2015)
Log Message
Merge r176541 - [GStreamer] gstmpegts is not initialized
https://bugs.webkit.org/show_bug.cgi?id=139039
Reviewed by Carlos Garcia Campos.
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer): Initialize the gstmpegts library.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178273 => 178274)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-12 17:54:19 UTC (rev 178273)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-12 17:56:00 UTC (rev 178274)
@@ -1,3 +1,13 @@
+2014-11-25 Philippe Normand <pnorm...@igalia.com>
+
+ [GStreamer] gstmpegts is not initialized
+ https://bugs.webkit.org/show_bug.cgi?id=139039
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::initializeGStreamer): Initialize the gstmpegts library.
+
2014-11-21 Chris Dumez <cdu...@apple.com>
Crash when setting 'transition-delay' CSS property to a calculated value
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (178273 => 178274)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-01-12 17:54:19 UTC (rev 178273)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-01-12 17:56:00 UTC (rev 178274)
@@ -29,6 +29,12 @@
#include <wtf/MathExtras.h>
#include <wtf/gobject/GUniquePtr.h>
+#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#define GST_USE_UNSTABLE_API
+#include <gst/mpegts/mpegts.h>
+#undef GST_USE_UNSTABLE_API
+#endif
+
namespace WebCore {
const char* webkitGstMapInfoQuarkString = "webkit-gst-map-info";
@@ -132,6 +138,12 @@
// FIXME: We should probably pass the arguments from the command line.
bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
ASSERT_WITH_MESSAGE(gstInitialized, "GStreamer initialization failed: %s", error ? error->message : "unknown error occurred");
+
+#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+ if (gstInitialized)
+ gst_mpegts_initialize();
+#endif
+
return gstInitialized;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
