summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2015-11-09 14:52:27 (GMT)
committerThibault Saunier <tsaunier@gnome.org>2015-11-11 13:08:29 (GMT)
commit9f4b52d1d69f83ebc27b45044fac915061e93a09 (patch)
treeac66ee4242feb7e25db56bb2f13bbfb878c895d7
parent052e962a770e7c2ee13ae64c858c67d2cc15c0cb (diff)
downloadWebKit-9f4b52d1d69f83ebc27b45044fac915061e93a09.tar.gz
WebKit-9f4b52d1d69f83ebc27b45044fac915061e93a09.tar.xz
[GStreamer] Fix build when wayland and X11 are enabled
Differential Revision: https://phabricator.collabora.co.uk/D331 Reviewed-by: Emanuele Aina <emanuele.aina@collabora.com>
-rw-r--r--Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
index c1efdc0..2b79bf6 100644
--- a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
@@ -564,10 +564,8 @@ static gboolean webkitVideoSinkSetCaps(GstBaseSink* baseSink, GstCaps* caps)
GstBufferPool* newpool = NULL;
GstStructure *structure = NULL;
#endif
-#if PLATFORM(WAYLAND)
- static GstAllocationParams params = { (GstMemoryFlags) 0, 0, 0, 15, 0 };
-#endif
-#if PLATFORM(X11)
+
+#if PLATFORM(WAYLAND) || PLATFORM(X11)
static GstAllocationParams params = { (GstMemoryFlags) 0, 15, 0, 15, 0 };
#endif