summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-06-23 16:57:16 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-06-23 16:57:16 +0000
commit184d9bfd53deef6d524bfbb3b46151d0d99de10f (patch)
treeedc5d15f197b868111a24e9a0c31b77c88b5c39b
parent732a544c7ca67550239d66b38bf0945a01e8cc51 (diff)
downloadgst-plugins-bad-184d9bfd53deef6d524bfbb3b46151d0d99de10f.tar.gz
gst-plugins-bad-184d9bfd53deef6d524bfbb3b46151d0d99de10f.tar.bz2
gst-plugins-bad-184d9bfd53deef6d524bfbb3b46151d0d99de10f.zip
merge back from release
Original commit message from CVS: merge back from release
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5da97a0a..f0fc6f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-23 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * ext/alsa/gstalsa.c: (gst_alsa_init), (gst_alsa_dispose),
+ (gst_alsa_change_state), (gst_alsa_update_avail),
+ (gst_alsa_xrun_recovery):
+ * ext/alsa/gstalsa.h:
+ * ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
+ merge back changes from release
+
2004-06-23 Wim Taymans <wim@fluendo.com>
* gst/audiorate/gstaudiorate.c: (gst_audiorate_class_init),