From 58dcee62e81f6dc42b7dcf3b16786bb555f55a6c Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 29 Jul 2014 11:47:55 +1000 Subject: [PATCH] glmemory: reenable the texture_rg support for !eagl The GST_GL_HAVE_PLATFORM_EAGL is always defined we need to compare against the value instead. --- gst-libs/gst/gl/gstglcolorconvert.c | 4 ++-- gst-libs/gst/gl/gstglmemory.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c index dc43353..87e04aa 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.c +++ b/gst-libs/gst/gl/gstglcolorconvert.c @@ -690,7 +690,7 @@ _YUV_to_RGB (GstGLColorConvert * convert) GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); const gchar *out_format_str = gst_video_format_to_string (out_format); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); -#ifdef GST_GL_HAVE_PLATFORM_EAGL +#if GST_GL_HAVE_PLATFORM_EAGL gboolean texture_rg = FALSE; #else gboolean texture_rg = @@ -889,7 +889,7 @@ _GRAY_to_RGB (GstGLColorConvert * convert) GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); const gchar *out_format_str = gst_video_format_to_string (out_format); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); -#ifdef GST_GL_HAVE_PLATFORM_EAGL +#if GST_GL_HAVE_PLATFORM_EAGL gboolean texture_rg = FALSE; #else gboolean texture_rg = diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index 94ce468..64314e6 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -193,7 +193,7 @@ GstVideoGLTextureType gst_gl_texture_type_from_format (GstGLContext * context, GstVideoFormat v_format, guint plane) { -#ifdef GST_GL_HAVE_PLATFORM_EAGL +#if GST_GL_HAVE_PLATFORM_EAGL gboolean texture_rg = FALSE; #else gboolean texture_rg = -- 2.7.4