diff options
author | Matthew Waters <matthew@centricular.com> | 2015-10-29 00:44:26 +1100 |
---|---|---|
committer | Matthew Waters <matthew@centricular.com> | 2015-10-30 14:24:53 +1100 |
commit | e61d504556870adf2b5d58b86b09a3327816dec2 (patch) | |
tree | 815b5053e71c9e40e0d7fefca3c72c55fc388b96 /ext/gl/gstgloverlay.c | |
parent | ff87ffe6e646c71763d9340f6c4e403107a57945 (diff) | |
download | gstreamer-plugins-bad-e61d504556870adf2b5d58b86b09a3327816dec2.tar.gz |
glmemory: add support for rectangle textures
Add the various tokens/strings for the differnet texture types (2D, rect, oes)
Changes the GLmemory api to include the GstGLTextureTarget in all relevant
functions.
Update the relevant caps/templates for 2D only textures.
Diffstat (limited to 'ext/gl/gstgloverlay.c')
-rw-r--r-- | ext/gl/gstgloverlay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gl/gstgloverlay.c b/ext/gl/gstgloverlay.c index ca07f8ba7..d4c1ee1a1 100644 --- a/ext/gl/gstgloverlay.c +++ b/ext/gl/gstgloverlay.c @@ -698,7 +698,7 @@ gst_gl_overlay_load_jpeg (GstGLOverlay * overlay, FILE * fp) overlay->image_memory = (GstGLMemory *) gst_gl_memory_alloc (GST_GL_BASE_FILTER (overlay)->context, - NULL, &v_info, 0, &v_align); + GST_GL_TEXTURE_TARGET_2D, NULL, &v_info, 0, &v_align); if (!gst_memory_map ((GstMemory *) overlay->image_memory, &map_info, GST_MAP_WRITE)) { @@ -803,7 +803,7 @@ gst_gl_overlay_load_png (GstGLOverlay * overlay, FILE * fp) gst_video_info_set_format (&v_info, GST_VIDEO_FORMAT_RGBA, width, height); overlay->image_memory = (GstGLMemory *) gst_gl_memory_alloc (GST_GL_BASE_FILTER (overlay)->context, - NULL, &v_info, 0, NULL); + GST_GL_TEXTURE_TARGET_2D, NULL, &v_info, 0, NULL); if (!gst_memory_map ((GstMemory *) overlay->image_memory, &map_info, GST_MAP_WRITE)) { |