Title: [247006] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 247006
- Author
- [email protected]
- Date
- 2019-07-01 06:04:50 -0700 (Mon, 01 Jul 2019)
Log Message
Merge r247005 - Unreviewed. Fix GTK build with GSTREAMER_GL disabled after r246710
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (247005 => 247006)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-07-01 12:10:54 UTC (rev 247005)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-07-01 13:04:50 UTC (rev 247006)
@@ -1,3 +1,9 @@
+2019-07-01 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK build with GSTREAMER_GL disabled after r246710
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
2019-06-10 Daniel Bates <[email protected]>
[CSP] Blob URLs should inherit their CSP policy
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (247005 => 247006)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2019-07-01 12:10:54 UTC (rev 247005)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2019-07-01 13:04:50 UTC (rev 247006)
@@ -37,6 +37,7 @@
#include <wtf/RunLoop.h>
#include <wtf/WeakPtr.h>
+#if USE(GSTREAMER_GL)
#if USE(LIBEPOXY)
// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
#include <epoxy/gl.h>
@@ -55,6 +56,7 @@
#define GST_USE_UNSTABLE_API
#include <gst/gl/gl.h>
#undef GST_USE_UNSTABLE_API
+#endif
#if USE(TEXTURE_MAPPER_GL)
#include "TextureMapperGL.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
