diff options
| author | Scott D Phillips <scott.d.phillips@intel.com> | 2017-03-14 14:18:17 -0700 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2017-03-15 14:32:14 +1100 |
| commit | 1586357a2fa67e04f7cd9d98daf79194491a85fc (patch) | |
| tree | 14bd518733ba30946359a92ca3e2f5f483b0a51d /gst-libs | |
| parent | ae7ba6ed46ec831a8dd273d923e420525fd58899 (diff) | |
| download | gstreamer-plugins-bad-1586357a2fa67e04f7cd9d98daf79194491a85fc.tar.gz | |
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
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstglformat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/gl/gstglformat.c b/gst-libs/gst/gl/gstglformat.c index 850212277..db66f7f83 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; } /** |