Title: [259955] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 259955
- Author
- [email protected]
- Date
- 2020-04-12 06:03:35 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258755 - Fix build with gstreamer 1.12
https://bugs.webkit.org/show_bug.cgi?id=209296
Patch by Mike Gorse <[email protected]> on 2020-03-20
Reviewed by Philippe Normand.
No new tests (build fix only).
* platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
(webKitGLVideoSinkChangeState): Add GST_VERSION_CHECK around check for
GST_STATE_CHANGE_READY_TO_READY.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (259954 => 259955)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:03:30 UTC (rev 259954)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:03:35 UTC (rev 259955)
@@ -1,3 +1,16 @@
+2020-03-20 Mike Gorse <[email protected]>
+
+ Fix build with gstreamer 1.12
+ https://bugs.webkit.org/show_bug.cgi?id=209296
+
+ Reviewed by Philippe Normand.
+
+ No new tests (build fix only).
+
+ * platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
+ (webKitGLVideoSinkChangeState): Add GST_VERSION_CHECK around check for
+ GST_STATE_CHANGE_READY_TO_READY.
+
2020-03-18 Eugene But <[email protected]>
Fix ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren crash
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp (259954 => 259955)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp 2020-04-12 13:03:30 UTC (rev 259954)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp 2020-04-12 13:03:35 UTC (rev 259955)
@@ -275,7 +275,9 @@
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
+#if GST_CHECK_VERSION(1, 14, 0)
case GST_STATE_CHANGE_READY_TO_READY:
+#endif
case GST_STATE_CHANGE_READY_TO_PAUSED: {
if (!priv->glDisplayElementContext)
priv->glDisplayElementContext = requestGLContext(sink, GST_GL_DISPLAY_CONTEXT_TYPE);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
