mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-20 14:18:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtkwaylandsink: Remove redefine of GST_CAPS_FEATURE_MEMORY_DMABUF

Browse source 
Instead just include the appropriate header file. There is no meson deps
modification as gstallocators_dep is already part of gstwayland_dep.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
This commit is contained in:
Nicolas Dufresne 2023-02-15 11:49:38 -05:00 committed by GStreamer Marge Bot
parent 37f2d2ac42
commit beaff76dd0
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/ext/gtk/gstgtkwaylandsink.c
View file

@ -25,13 +25,13 @@
#endif #endif
#include "gstgtkwaylandsink.h" #include "gstgtkwaylandsink.h"
#include <gdk/gdk.h>
#include <gst/wayland/wayland.h>
#include "gstgtkutils.h" #include "gstgtkutils.h"
#include "gtkgstwaylandwidget.h" #include "gtkgstwaylandwidget.h"
#include <gdk/gdk.h>
#include <gst/allocators/allocators.h>
#include <gst/wayland/wayland.h>
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h> #include <gdk/gdkwayland.h>
#else #else
@ -41,10 +41,6 @@
#define GST_CAT_DEFAULT gst_debug_gtk_wayland_sink #define GST_CAT_DEFAULT gst_debug_gtk_wayland_sink
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); 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 \ #define WL_VIDEO_FORMATS \
"{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, " \ "{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, " \
"RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, " \ "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, " \