mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 22:46:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Removed unreachable break, unused variable

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=736957
This commit is contained in:
Sanjay NM 2014-09-19 15:32:33 +05:30 committed by Tim-Philipp Müller
parent 7e21e35eac
commit 4f6e9f4e41
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/gl/gstglimagesink.c
View file

@ -554,7 +554,6 @@ gst_glimage_sink_query (GstBaseSink * bsink, GstQuery * query)
{ {
return gst_gl_handle_context_query ((GstElement *) glimage_sink, query, return gst_gl_handle_context_query ((GstElement *) glimage_sink, query,
&glimage_sink->display); &glimage_sink->display);
break;
} }
default: default:
res = GST_BASE_SINK_CLASS (parent_class)->query (bsink, query); res = GST_BASE_SINK_CLASS (parent_class)->query (bsink, query);

5
ext/gl/gstglmixer.c
View file

@ -272,10 +272,9 @@ gst_gl_mixer_sink_query (GstAggregator * agg, GstAggregatorPad * bpad,
case GST_QUERY_ALLOCATION: case GST_QUERY_ALLOCATION:
{ {
GstQuery *decide_query = NULL; GstQuery *decide_query = NULL;
gboolean negotiated;
GST_OBJECT_LOCK (mix); GST_OBJECT_LOCK (mix);
if (G_UNLIKELY (!(negotiated = mix->priv->negotiated))) { if (G_UNLIKELY (!mix->priv->negotiated)) {
GST_DEBUG_OBJECT (mix, GST_DEBUG_OBJECT (mix,
"not negotiated yet, can't answer ALLOCATION query"); "not negotiated yet, can't answer ALLOCATION query");
GST_OBJECT_UNLOCK (mix); 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, G_TYPE_POINTER, &handle, "gst.gl.context.type", G_TYPE_STRING,
&type, "gst.gl.context.apis", G_TYPE_STRING, &apis, NULL) &type, "gst.gl.context.apis", G_TYPE_STRING, &apis, NULL)
&& handle) { && handle) {
GstGLPlatform platform = GST_GL_PLATFORM_NONE; GstGLPlatform platform;
GstGLAPI gl_apis; GstGLAPI gl_apis;
GST_DEBUG ("got GL context handle 0x%p with type %s and apis %s", GST_DEBUG ("got GL context handle 0x%p with type %s and apis %s",