From 4f6e9f4e4140ac8f3149267bcafd8fcb8c145438 Mon Sep 17 00:00:00 2001 From: Sanjay NM Date: Fri, 19 Sep 2014 15:32:33 +0530 Subject: [PATCH] gl: Removed unreachable break, unused variable https://bugzilla.gnome.org/show_bug.cgi?id=736957 --- ext/gl/gstglimagesink.c | 1 - ext/gl/gstglmixer.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index 197966a7eb..59355a2401 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -554,7 +554,6 @@ gst_glimage_sink_query (GstBaseSink * bsink, GstQuery * query) { return gst_gl_handle_context_query ((GstElement *) glimage_sink, query, &glimage_sink->display); - break; } default: res = GST_BASE_SINK_CLASS (parent_class)->query (bsink, query); diff --git a/ext/gl/gstglmixer.c b/ext/gl/gstglmixer.c index 5aa1beab90..72291a8bad 100644 --- a/ext/gl/gstglmixer.c +++ b/ext/gl/gstglmixer.c @@ -272,10 +272,9 @@ gst_gl_mixer_sink_query (GstAggregator * agg, GstAggregatorPad * bpad, case GST_QUERY_ALLOCATION: { GstQuery *decide_query = NULL; - gboolean negotiated; GST_OBJECT_LOCK (mix); - if (G_UNLIKELY (!(negotiated = mix->priv->negotiated))) { + if (G_UNLIKELY (!mix->priv->negotiated)) { GST_DEBUG_OBJECT (mix, "not negotiated yet, can't answer ALLOCATION query"); GST_OBJECT_UNLOCK (mix); @@ -624,7 +623,7 @@ gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query) G_TYPE_POINTER, &handle, "gst.gl.context.type", G_TYPE_STRING, &type, "gst.gl.context.apis", G_TYPE_STRING, &apis, NULL) && handle) { - GstGLPlatform platform = GST_GL_PLATFORM_NONE; + GstGLPlatform platform; GstGLAPI gl_apis; GST_DEBUG ("got GL context handle 0x%p with type %s and apis %s",