Title: [248258] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 248258
- Author
- [email protected]
- Date
- 2019-08-03 20:24:18 -0700 (Sat, 03 Aug 2019)
Log Message
Merge r248009 - [GTK] Compilation errors when GL is disabled
https://bugs.webkit.org/show_bug.cgi?id=200223
Unreviewed, fix build with -DENABLE_OPENGL=OFF.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (248257 => 248258)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-08-04 03:24:16 UTC (rev 248257)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-08-04 03:24:18 UTC (rev 248258)
@@ -1,3 +1,13 @@
+2019-07-30 Michael Catanzaro <[email protected]>
+
+ [GTK] Compilation errors when GL is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=200223
+
+ Unreviewed, fix build with -DENABLE_OPENGL=OFF.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+
2019-07-29 Philippe Normand <[email protected]>
REGRESSION(r243058): [GStreamer] WebKitWebSrc's internal queue can exhaust the WebProcess memory
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (248257 => 248258)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-08-04 03:24:16 UTC (rev 248257)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-08-04 03:24:18 UTC (rev 248258)
@@ -2500,7 +2500,9 @@
else if (g_str_has_prefix(elementName.get(), "imxvpudecoder"))
player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::ImxVPU;
+#if USE(TEXTURE_MAPPER_GL)
player->updateTextureMapperFlags();
+#endif
}), this);
g_signal_connect_swapped(m_pipeline.get(), "source-setup", G_CALLBACK(sourceSetupCallback), this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
