From 659477c7c728233064a959eceeb1bb5f8cb03a3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 11 Apr 2015 19:35:48 +0200 Subject: [PATCH] glcolorconvert: Fix last commit --- gst-libs/gst/gl/gstglcolorconvert.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c index a6af31ea8f..243fc7189c 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.c +++ b/gst-libs/gst/gl/gstglcolorconvert.c @@ -897,10 +897,12 @@ _YUV_to_RGB (GstGLColorConvert * convert) const gchar *out_format_str = gst_video_format_to_string (out_format); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gboolean texture_rg = - gst_gl_context_check_feature (context, "GL_EXT_texture_rg") - || gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) - || gst_gl_context_check_feature (context, "GL_ARB_texture_rg") - || gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); + gst_gl_context_check_feature (convert->context, "GL_EXT_texture_rg") + || gst_gl_context_check_gl_version (convert->context, GST_GL_API_GLES2, 3, + 0) + || gst_gl_context_check_feature (convert->context, "GL_ARB_texture_rg") + || gst_gl_context_check_gl_version (convert->context, GST_GL_API_OPENGL3, + 3, 0); gboolean apple_ycbcr = gst_gl_context_check_feature (convert->context, "GL_APPLE_ycbcr_422"); gboolean in_tex_rectangular = FALSE; @@ -1133,10 +1135,12 @@ _GRAY_to_RGB (GstGLColorConvert * convert) const gchar *out_format_str = gst_video_format_to_string (out_format); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gboolean texture_rg = - gst_gl_context_check_feature (context, "GL_EXT_texture_rg") - || gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) - || gst_gl_context_check_feature (context, "GL_ARB_texture_rg") - || gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); + gst_gl_context_check_feature (convert->context, "GL_EXT_texture_rg") + || gst_gl_context_check_gl_version (convert->context, GST_GL_API_GLES2, 3, + 0) + || gst_gl_context_check_feature (convert->context, "GL_ARB_texture_rg") + || gst_gl_context_check_gl_version (convert->context, GST_GL_API_OPENGL3, + 3, 0); info->in_n_textures = 1; info->out_n_textures = 1; -- 2.34.1