mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 11:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: update sys dependants for function removals

Browse source 
4315a4b54d forgot to change the androidmedia/videotoolbox/caopengllayer
sources as required.
This commit is contained in:
Matthew Waters 2017-01-13 12:49:37 +11:00 committed by Tim-Philipp Müller
parent c469827ddb
commit ad20a945de
2 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ext/gl/caopengllayersink.m
View file

@ -387,41 +387,10 @@ gst_ca_opengl_layer_sink_query (GstBaseSink * bsink, GstQuery * query)
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CONTEXT: case GST_QUERY_CONTEXT:
{ {
const gchar *context_type; if (gst_gl_handle_context_query ((GstElement *) ca_sink, query,
GstContext *context, *old_context; ca_sink->display, ca_sink->context, ca_sink->other_context))
gboolean ret; return TRUE;
break;
ret =
gst_gl_handle_context_query ((GstElement *) ca_sink, query,
&ca_sink->display, &ca_sink->other_context);
if (ca_sink->display)
gst_gl_display_filter_gl_api (ca_sink->display, SUPPORTED_GL_APIS);
gst_query_parse_context_type (query, &context_type);
if (g_strcmp0 (context_type, "gst.gl.local_context") == 0) {
GstStructure *s;
gst_query_parse_context (query, &old_context);
if (old_context)
context = gst_context_copy (old_context);
else
context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context);
gst_structure_set (s, "context", GST_TYPE_GL_CONTEXT,
ca_sink->context, NULL);
gst_query_set_context (query, context);
gst_context_unref (context);
ret = ca_sink->context != NULL;
}
GST_DEBUG_OBJECT (ca_sink, "context query of type %s %i",
context_type, ret);
if (ret)
return ret;
} }
case GST_QUERY_DRAIN: case GST_QUERY_DRAIN:
{ {

1
gst-libs/gst/gl/Makefile.am
View file

@ -71,6 +71,7 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
noinst_HEADERS = \ noinst_HEADERS = \
gstglfeature_private.h \ gstglfeature_private.h \
gstglsl_private.h \ gstglsl_private.h \
gstglutils_private.h \
utils/opengl_versions.h \ utils/opengl_versions.h \
utils/gles_versions.h utils/gles_versions.h