diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/faac/gstfaac.c | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 4 | ||||
| -rw-r--r-- | gst/tta/gstttaparse.c | 4 |
4 files changed, 11 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2005-11-21 Wim Taymans <wim@fluendo.com> + + * ext/faac/gstfaac.c: (gst_faac_sink_event): + * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event): + * gst/tta/gstttaparse.c: (gst_tta_parse_src_event): + Fix for stream lock updates. + 2005-11-21 Tim-Philipp Müller <tim at centricular dot net> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c index 52ce8177..f89ad751 100644 --- a/ext/faac/gstfaac.c +++ b/ext/faac/gstfaac.c @@ -431,8 +431,6 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event) { GstBuffer *outbuf; - GST_STREAM_LOCK (pad); - /* flush first */ ret = TRUE; do { @@ -455,18 +453,13 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event) } while (ret); ret = gst_pad_event_default (pad, event); - GST_STREAM_UNLOCK (pad); break; } case GST_EVENT_NEWSEGMENT: - GST_STREAM_LOCK (pad); ret = gst_pad_push_event (faac->srcpad, event); - GST_STREAM_UNLOCK (pad); break; case GST_EVENT_TAG: - GST_STREAM_LOCK (pad); ret = gst_pad_event_default (pad, event); - GST_STREAM_UNLOCK (pad); break; default: ret = gst_pad_event_default (pad, event); diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 9a598554..8d0d5c3e 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -358,7 +358,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event) } gst_pad_event_default (pad, gst_event_new_flush_start ()); - GST_STREAM_LOCK (pad); + GST_PAD_STREAM_LOCK (pad); /* resync to new time */ for (n = 0; n < qtdemux->n_streams; n++) { @@ -378,7 +378,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event) gst_pad_start_task (qtdemux->sinkpad, (GstTaskFunction) gst_qtdemux_loop_header, qtdemux->sinkpad); - GST_STREAM_UNLOCK (pad); + GST_PAD_STREAM_UNLOCK (pad); break; } default: diff --git a/gst/tta/gstttaparse.c b/gst/tta/gstttaparse.c index cb37ea0b..e7d65164 100644 --- a/gst/tta/gstttaparse.c +++ b/gst/tta/gstttaparse.c @@ -187,7 +187,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event) } else { gst_pad_pause_task (ttaparse->sinkpad); } - GST_STREAM_LOCK (ttaparse->sinkpad); + GST_PAD_STREAM_LOCK (ttaparse->sinkpad); switch (start_type) { case GST_SEEK_TYPE_CUR: @@ -216,7 +216,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event) gst_pad_start_task (ttaparse->sinkpad, (GstTaskFunction) gst_tta_parse_loop, ttaparse); - GST_STREAM_UNLOCK (ttaparse->sinkpad); + GST_PAD_STREAM_UNLOCK (ttaparse->sinkpad); } else { res = FALSE; |