From fcc7538113b76ccb9807f2c44007b65f88d88f68 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 13 Nov 2007 06:57:57 +0000 Subject: [PATCH] gst/asfdemux/gstasfdemux.c: Sync _activate_pull() a little more with other demuxers. Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: Sync _activate_pull() a little more with other demuxers. --- ChangeLog | 5 +++++ gst/asfdemux/gstasfdemux.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26be6007f6..e667cf3382 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-13 Stefan Kost + + * gst/asfdemux/gstasfdemux.c: + Sync _activate_pull() a little more with other demuxers. + 2007-11-11 Thijs Vermeir * gst/mpegstream/gstmpegdemux.c: diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 50b46c423e..eae3e21940 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -273,7 +273,6 @@ static gboolean gst_asf_demux_activate_pull (GstPad * pad, gboolean active) { GstASFDemux *demux; - gboolean ret; demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (pad)); @@ -281,11 +280,11 @@ gst_asf_demux_activate_pull (GstPad * pad, gboolean active) demux->state = GST_ASF_DEMUX_STATE_HEADER; demux->streaming = FALSE; - ret = gst_pad_start_task (pad, (GstTaskFunction) gst_asf_demux_loop, demux); + return gst_pad_start_task (pad, (GstTaskFunction) gst_asf_demux_loop, + demux); } else { - ret = gst_pad_stop_task (pad); + return gst_pad_stop_task (pad); } - return ret; }