summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnuj Jaiswal <anuj.jaiswal@samsung.com>2014-09-18 17:26:37 +0530
committerLuis de Bethencourt <luis.bg@samsung.com>2014-09-24 14:45:20 +0100
commite4247f0a5a0af7c6098f2edbf2dd3c30ea57a4cf (patch)
tree812aaa44ac243403257f2522d3996b6adce4b7ec
parent085a34e4c7c478e854ef4ba13ab5e4269cd87df7 (diff)
downloadgstreamer-plugins-bad-e4247f0a5a0af7c6098f2edbf2dd3c30ea57a4cf.tar.gz
mplex: break statement unnecessary
One more code flow issue where it never arrives to the break statement due to the goto. So the break is unnecessary. Plus two coding style fixes. https://bugzilla.gnome.org/show_bug.cgi?id=736895
-rw-r--r--ext/mplex/gstmplex.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 94bf948dc..b109d1833 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -190,8 +190,7 @@ gst_mplex_init (GstMplex * mplex)
{
GstElement *element = GST_ELEMENT (mplex);
- mplex->srcpad =
- gst_pad_new_from_static_template (&src_templ, "src");
+ mplex->srcpad = gst_pad_new_from_static_template (&src_templ, "src");
gst_element_add_pad (element, mplex->srcpad);
gst_pad_use_fixed_caps (mplex->srcpad);
gst_pad_set_activatemode_function (mplex->srcpad,
@@ -507,7 +506,7 @@ gst_mplex_sink_event (GstPad * sinkpad, GstObject * parent, GstEvent * event)
result = gst_mplex_setcaps (sinkpad, caps);
gst_event_unref (event);
goto done;
- break;
+
}
default:
/* for a serialized event, wait until earlier data is gone,
@@ -537,7 +536,8 @@ gst_mplex_start_task (GstMplex * mplex)
if (G_UNLIKELY (mplex->srcresult == GST_FLOW_CUSTOM_SUCCESS)
&& mplex->job->video_tracks == mplex->num_vpads
&& mplex->job->audio_tracks == mplex->num_apads) {
- gst_pad_start_task (mplex->srcpad, (GstTaskFunction) gst_mplex_loop, mplex, NULL);
+ gst_pad_start_task (mplex->srcpad, (GstTaskFunction) gst_mplex_loop, mplex,
+ NULL);
mplex->srcresult = GST_FLOW_OK;
}
}