mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmemoryegl: remove spurious #if GST_GL_HAVE_DMABUF conditions

Browse source 
8c2118823b had some incorrect preprocessor
conditions that aren't actually needed.  Remove them.

https://bugzilla.gnome.org/show_bug.cgi?id=775248
This commit is contained in:
Matthew Waters 2016-11-30 19:26:51 +11:00 committed by Tim-Philipp Müller
parent 7306f2de2c
commit bf7b608728
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/gl/egl/gsteglimage.c
View file

@ -81,8 +81,6 @@
GST_DEFINE_MINI_OBJECT_TYPE (GstEGLImage, gst_egl_image); 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 #ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT gst_egl_image_ensure_debug_category() #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; return (GstDebugCategory *) cat_gonce;
} }
#endif /* GST_DISABLE_GST_DEBUG */ #endif /* GST_DISABLE_GST_DEBUG */
#endif /* GST_GL_HAVE_DMABUF */
/** /**
* gst_egl_image_get_image: * 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)); (EGLDisplay) gst_gl_display_get_handle (GST_GL_DISPLAY (display_egl));
gst_object_unref (display_egl); gst_object_unref (display_egl);
#if GST_GL_HAVE_DMABUF
if (target != EGL_LINUX_DMA_BUF_EXT) if (target != EGL_LINUX_DMA_BUF_EXT)
egl_context = (EGLContext) gst_gl_context_get_gl_context (context); egl_context = (EGLContext) gst_gl_context_get_gl_context (context);
#endif
if (attribs) if (attribs)
while (attribs[attrib_len++] != EGL_NONE) { while (attribs[attrib_len++] != EGL_NONE) {