From b8d87c11ab80ba43fc887414b58ed20c58f9d7d3 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Tue, 27 May 2014 07:42:14 -0300 Subject: [PATCH] mxfdemux: remove unread last_flow variable it isn't necessary anymore and is already unused --- gst/mxf/mxfdemux.c | 19 ++----------------- gst/mxf/mxfdemux.h | 1 - 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index bba7398..1c093b4 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -103,7 +103,6 @@ gst_mxf_demux_pad_class_init (GstMXFDemuxPadClass * klass) static void gst_mxf_demux_pad_init (GstMXFDemuxPad * pad) { - pad->last_flow = GST_FLOW_OK; pad->position = 0; } @@ -284,19 +283,6 @@ gst_mxf_demux_reset (GstMXFDemux * demux) } static GstFlowReturn -gst_mxf_demux_combine_flows (GstMXFDemux * demux, - GstMXFDemuxPad * pad, GstFlowReturn ret) -{ - /* store the value */ - pad->last_flow = ret; - - ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); - - GST_LOG_OBJECT (demux, "combined return %s", gst_flow_get_name (ret)); - return ret; -} - -static GstFlowReturn gst_mxf_demux_pull_range (GstMXFDemux * demux, guint64 offset, guint size, GstBuffer ** buffer) { @@ -1839,7 +1825,8 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux, ret = gst_pad_push (GST_PAD_CAST (pad), outbuf); outbuf = NULL; - ret = gst_mxf_demux_combine_flows (demux, pad, ret); + ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); + GST_LOG_OBJECT (demux, "combined return %s", gst_flow_get_name (ret)); if (pad->position > demux->segment.position) demux->segment.position = pad->position; @@ -3239,7 +3226,6 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event) /* Reset EOS flag on all pads */ p->eos = FALSE; - p->last_flow = GST_FLOW_OK; gst_mxf_demux_pad_set_position (demux, p, start); position = p->current_essence_track_position; @@ -3403,7 +3389,6 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event) /* Reset EOS flag on all pads */ p->eos = FALSE; - p->last_flow = GST_FLOW_OK; gst_mxf_demux_pad_set_position (demux, p, start); /* we always want to send data starting with a key unit */ diff --git a/gst/mxf/mxfdemux.h b/gst/mxf/mxfdemux.h index 12ac555..38c7725 100644 --- a/gst/mxf/mxfdemux.h +++ b/gst/mxf/mxfdemux.h @@ -96,7 +96,6 @@ struct _GstMXFDemuxPad GstClockTime position; gdouble position_accumulated_error; - GstFlowReturn last_flow; gboolean eos, discont; GstTagList *tags; -- 2.7.4