diff options
| author | Matthew Waters <matthew@centricular.com> | 2016-11-30 19:26:51 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2016-11-30 19:29:27 +1100 |
| commit | 1db88cbee7aa071e7fdd521dad01bcd70e1f1d2f (patch) | |
| tree | 5d24c58f96512e2dbe9ffc78b6acc1dcbb5e54a4 /gst-libs | |
| parent | aa08be43c7348dc1e0f6e968946bd810c417c267 (diff) | |
| download | gstreamer-plugins-bad-1db88cbee7aa071e7fdd521dad01bcd70e1f1d2f.tar.gz | |
glmemoryegl: remove spurious #if GST_GL_HAVE_DMABUF conditions
8c2118823b3d42840cc6f48cbdc0e1b342f90b80 had some incorrect preprocessor
conditions that aren't actually needed. Remove them.
https://bugzilla.gnome.org/show_bug.cgi?id=775248
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/egl/gsteglimage.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gst-libs/gst/gl/egl/gsteglimage.c b/gst-libs/gst/gl/egl/gsteglimage.c index 24dacdc33..ddb7ef279 100644 --- a/gst-libs/gst/gl/egl/gsteglimage.c +++ b/gst-libs/gst/gl/egl/gsteglimage.c @@ -81,8 +81,6 @@ GST_DEFINE_MINI_OBJECT_TYPE (GstEGLImage, gst_egl_image); -/* XXX: This is only used currently if dmabuf support is enabled */ -#if GST_GL_HAVE_DMABUF #ifndef GST_DISABLE_GST_DEBUG #define GST_CAT_DEFAULT gst_egl_image_ensure_debug_category() @@ -102,7 +100,6 @@ gst_egl_image_ensure_debug_category (void) return (GstDebugCategory *) cat_gonce; } #endif /* GST_DISABLE_GST_DEBUG */ -#endif /* GST_GL_HAVE_DMABUF */ /** * gst_egl_image_get_image: @@ -220,10 +217,8 @@ _gst_egl_image_create (GstGLContext * context, guint target, (EGLDisplay) gst_gl_display_get_handle (GST_GL_DISPLAY (display_egl)); gst_object_unref (display_egl); -#if GST_GL_HAVE_DMABUF if (target != EGL_LINUX_DMA_BUF_EXT) egl_context = (EGLContext) gst_gl_context_get_gl_context (context); -#endif if (attribs) while (attribs[attrib_len++] != EGL_NONE) { |