From beaff76dd0b92a5742133a45a73fb7637d5a2476 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 15 Feb 2023 11:49:38 -0500 Subject: [PATCH] gtkwaylandsink: Remove redefine of GST_CAPS_FEATURE_MEMORY_DMABUF Instead just include the appropriate header file. There is no meson deps modification as gstallocators_dep is already part of gstwayland_dep. Part-of: --- .../gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c b/subprojects/gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c index e4dd06e9f1..35367ca130 100644 --- a/subprojects/gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c +++ b/subprojects/gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c @@ -25,13 +25,13 @@ #endif #include "gstgtkwaylandsink.h" - -#include -#include - #include "gstgtkutils.h" #include "gtkgstwaylandwidget.h" +#include +#include +#include + #ifdef GDK_WINDOWING_WAYLAND #include #else @@ -41,10 +41,6 @@ #define GST_CAT_DEFAULT gst_debug_gtk_wayland_sink GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -#ifndef GST_CAPS_FEATURE_MEMORY_DMABUF -#define GST_CAPS_FEATURE_MEMORY_DMABUF "memory:DMABuf" -#endif - #define WL_VIDEO_FORMATS \ "{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, " \ "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, " \