diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-11-13 06:55:28 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-11-13 06:55:28 +0000 |
| commit | 561bfe045733931b0a75e936108dd1a312387a08 (patch) | |
| tree | 8c38b39f0c19c8595bba916ce7e0990c6c595498 /gst/avi/gstavidemux.c | |
| parent | 34c221a52f3aec1726c8d390bee259c1381fa8a9 (diff) | |
gst/: Return the result in _activate_pull(). Don't ref element there.
Original commit message from CVS:
* gst/avi/gstavidemux.c:
* gst/wavparse/gstwavparse.c:
Return the result in _activate_pull(). Don't ref element there.
Diffstat (limited to 'gst/avi/gstavidemux.c')
| -rw-r--r-- | gst/avi/gstavidemux.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 06cf2140..e6eb49ee 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -3834,6 +3834,7 @@ static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad) { if (gst_pad_check_pull_range (sinkpad)) { + GST_DEBUG ("going to pull mode"); return gst_pad_activate_pull (sinkpad, TRUE); } else { GST_DEBUG ("going to push (streaming) mode"); @@ -3844,18 +3845,16 @@ gst_avi_demux_sink_activate (GstPad * sinkpad) static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad, gboolean active) { - GstAviDemux *avi = GST_AVI_DEMUX (gst_pad_get_parent (sinkpad)); + GstAviDemux *avi = GST_AVI_DEMUX (GST_OBJECT_PARENT (sinkpad)); if (active) { avi->segment_running = TRUE; - gst_pad_start_task (sinkpad, (GstTaskFunction) gst_avi_demux_loop, sinkpad); + return gst_pad_start_task (sinkpad, (GstTaskFunction) gst_avi_demux_loop, + sinkpad); } else { - gst_pad_stop_task (sinkpad); avi->segment_running = FALSE; + return gst_pad_stop_task (sinkpad); } - gst_object_unref (avi); - - return TRUE; } static gboolean |