From 8d3d6d359581640be3ec5f9740ae10df1f46b161 Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Tue, 14 Mar 2017 14:18:17 -0700 Subject: [PATCH] gl/format: correct return enums in gst_gl_format_from_video_info In commit > 956c4d0 gl/format: use our own GL format enum's instead of gstvideo's the name and return type of gst_gl_format_from_video_info changed, but some returns of the old type were missed. Here they are updated to the correct type. https://bugzilla.gnome.org/show_bug.cgi?id=780064 --- gst-libs/gst/gl/gstglformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/gstglformat.c b/gst-libs/gst/gl/gstglformat.c index 8502122773..db66f7f83b 100644 --- a/gst-libs/gst/gl/gstglformat.c +++ b/gst-libs/gst/gl/gstglformat.c @@ -154,7 +154,7 @@ gst_gl_format_from_video_info (GstGLContext * context, GstVideoInfo * vinfo, break; case GST_VIDEO_FORMAT_RGB16: case GST_VIDEO_FORMAT_BGR16: - return GST_VIDEO_GL_TEXTURE_TYPE_RGB16; + return GST_GL_RGB565; case GST_VIDEO_FORMAT_GRAY16_BE: case GST_VIDEO_FORMAT_GRAY16_LE: case GST_VIDEO_FORMAT_YUY2: @@ -197,7 +197,7 @@ gst_gl_format_from_video_info (GstGLContext * context, GstVideoInfo * vinfo, break; } - return GST_VIDEO_GL_TEXTURE_TYPE_RGBA; + return GST_GL_RGBA; } /**