summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-09-04 16:25:06 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-09-04 16:25:06 +0000
commit265a494de53b7b62d48d244acb2094aa73e1637e (patch)
treea3108196c0a57e79e7eeac45190ebcd30e40599b
parentfb3d85f292802687cccb1e567ef610bcb9ddcd9d (diff)
gst-libs/gst/audio/gstaudiosrc.c: Disable a code path that is now called but causes a deadlock for some reason and is...
Original commit message from CVS: * gst-libs/gst/audio/gstaudiosrc.c: (gst_audioringbuffer_stop): Disable a code path that is now called but causes a deadlock for some reason and is unneeded.
-rw-r--r--ChangeLog6
-rw-r--r--gst-libs/gst/audio/gstaudiosrc.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8df26232..9bde2ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst-libs/gst/audio/gstaudiosrc.c: (gst_audioringbuffer_stop):
+ Disable a code path that is now called but causes a deadlock for some
+ reason and is unneeded.
+
2008-09-04 Stefan Kost <ensonic@users.sf.net>
* sys/xvimage/xvimagesink.c:
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index 2afb3979..8974e23c 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -439,10 +439,11 @@ gst_audioringbuffer_stop (GstRingBuffer * buf)
csrc->reset (src);
GST_DEBUG ("reset done");
}
-
+#if 0
GST_DEBUG ("stop, waiting...");
GST_AUDIORING_BUFFER_WAIT (buf);
GST_DEBUG ("stoped");
+#endif
return TRUE;
}