summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-03-22 15:58:50 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-03-22 15:58:50 +0100
commit2224a990a85bfa5200849f26c0281cbd66872cab (patch)
tree4b99f0d00f40bd41cf079f12741f93227886d763
parenteffb5786da04e28effadc0602ef1ec5465458801 (diff)
downloadgst-plugins-bad-2224a990a85bfa5200849f26c0281cbd66872cab.tar.gz
gst-plugins-bad-2224a990a85bfa5200849f26c0281cbd66872cab.tar.bz2
gst-plugins-bad-2224a990a85bfa5200849f26c0281cbd66872cab.zip
mxfmux: Fix error handling
-rw-r--r--gst/mxf/mxfmux.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index 87a00136..26ba57c5 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -1012,7 +1012,7 @@ gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * cpad)
GstFlowReturn ret = GST_FLOW_OK;
guint8 slen, ber[9];
- GST_DEBUG_OBJECT (mux,
+ GST_DEBUG_OBJECT (cpad->collect.pad,
"Handling buffer of size %u for track %u at position %" G_GINT64_FORMAT,
GST_BUFFER_SIZE (buf), cpad->source_track->parent.track_id, cpad->pos);
@@ -1318,8 +1318,6 @@ gst_mxf_mux_collected (GstCollectPads * pads, gpointer user_data)
}
if (!eos && best) {
- GST_DEBUG_OBJECT (mux, "Handling buffer for pad '%" GST_PTR_FORMAT "'",
- best->collect.pad);
ret = gst_mxf_mux_handle_buffer (mux, best);
if (ret != GST_FLOW_OK)
goto error;
@@ -1333,10 +1331,10 @@ gst_mxf_mux_collected (GstCollectPads * pads, gpointer user_data)
gst_mxf_mux_handle_eos (mux);
gst_pad_push_event (mux->srcpad, gst_event_new_eos ());
return GST_FLOW_UNEXPECTED;
- } else {
- return GST_FLOW_OK;
}
+ return GST_FLOW_OK;
+
error:
{
mux->state = GST_MXF_MUX_STATE_ERROR;