diff options
| author | Andy Wingo <wingo@pobox.com> | 2007-12-05 11:25:58 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2007-12-05 11:25:58 +0000 |
| commit | b762832214df06e733848c55efff325002e63cf4 (patch) | |
| tree | 2c5ce20401f9770e6b766af614ec0c2fb25bc824 | |
| parent | f44ca529d7773a095b9a02745ee71349b5161b2d (diff) | |
| download | gst-plugins-bad-b762832214df06e733848c55efff325002e63cf4.tar.gz gst-plugins-bad-b762832214df06e733848c55efff325002e63cf4.tar.bz2 gst-plugins-bad-b762832214df06e733848c55efff325002e63cf4.zip | |
gst/switch/gstswitch.c (gst_switch_set_property): Don't push buffers from app thread when unsetting `queue-buffers', ...
Original commit message from CVS:
2007-12-05 Andy Wingo <wingo@pobox.com>
* gst/switch/gstswitch.c (gst_switch_set_property): Don't push
buffers from app thread when unsetting `queue-buffers', it's
dangerous and the chain function will do it for us anyway.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/switch/gstswitch.c | 17 |
2 files changed, 6 insertions, 17 deletions
@@ -1,3 +1,9 @@ +2007-12-05 Andy Wingo <wingo@pobox.com> + + * gst/switch/gstswitch.c (gst_switch_set_property): Don't push + buffers from app thread when unsetting `queue-buffers', it's + dangerous and the chain function will do it for us anyway. + 2007-12-04 Edgard Lima <edgard.lima@indt.org.br> * ext/metadata/metadatamuxjpeg.c: (metadatamux_wrap_chunk), diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c index 4fce29e7..9d9ff240 100644 --- a/gst/switch/gstswitch.c +++ b/gst/switch/gstswitch.c @@ -513,23 +513,6 @@ gst_switch_set_property (GObject * object, guint prop_id, case ARG_QUEUE_BUFFERS: GST_SWITCH_LOCK (gstswitch); gstswitch->queue_buffers = g_value_get_boolean (value); - if (!gstswitch->queue_buffers && !gstswitch->need_to_send_newsegment) { - GList *buffers; - - /* send all the stored buffers if any */ - buffers = - g_hash_table_lookup (gstswitch->stored_buffers, - gstswitch->active_sinkpad); - while (buffers != NULL) { - gst_buffer_ref (GST_BUFFER (buffers->data)); - GST_SWITCH_UNLOCK (gstswitch); - gst_pad_push (gstswitch->srcpad, GST_BUFFER (buffers->data)); - GST_SWITCH_LOCK (gstswitch); - buffers = buffers->next; - } - g_hash_table_remove (gstswitch->stored_buffers, - gstswitch->active_sinkpad); - } GST_SWITCH_UNLOCK (gstswitch); break; default: |