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

glmemory: reenable the texture_rg support for !eagl

Browse source 
The GST_GL_HAVE_PLATFORM_EAGL is always defined we need to compare
against the value instead.
This commit is contained in:
Matthew Waters 2014-07-29 11:47:55 +10:00 committed by Tim-Philipp Müller
parent e6d5dd04d5
commit 2b82b78ef5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/gstglcolorconvert.c
View file

@ -690,7 +690,7 @@ _YUV_to_RGB (GstGLColorConvert * convert)
GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info);
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); 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; gboolean texture_rg = FALSE;
#else #else
gboolean texture_rg = gboolean texture_rg =
@ -889,7 +889,7 @@ _GRAY_to_RGB (GstGLColorConvert * convert)
GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); GstVideoFormat out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info);
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); 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; gboolean texture_rg = FALSE;
#else #else
gboolean texture_rg = gboolean texture_rg =

2
gst-libs/gst/gl/gstglmemory.c
View file

@ -193,7 +193,7 @@ GstVideoGLTextureType
gst_gl_texture_type_from_format (GstGLContext * context, gst_gl_texture_type_from_format (GstGLContext * context,
GstVideoFormat v_format, guint plane) GstVideoFormat v_format, guint plane)
{ {
#ifdef GST_GL_HAVE_PLATFORM_EAGL #if GST_GL_HAVE_PLATFORM_EAGL
gboolean texture_rg = FALSE; gboolean texture_rg = FALSE;
#else #else
gboolean texture_rg = gboolean texture_rg =