From 278e55e65c47d1446a97eec2b7a8f589820c5c2f Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 7 Jun 2004 20:44:55 +0000 Subject: [PATCH] ext/alsa/gstalsasink.c: handle discont events if they happen before caps nego Original commit message from CVS: * ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event): handle discont events if they happen before caps nego --- ChangeLog | 6 ++++++ ext/alsa/gstalsasink.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c8ebdef7bd..5280e004a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-07 Benjamin Otte + + * ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event): + handle discont events if they happen before caps nego + 2004-06-07 Wim Taymans * gst/multipart/multipartdemux.c: (gst_multipart_demux_base_init), @@ -20,6 +25,7 @@ - check for soundcard.h in different places for some BSD 2004-06-07 Jan Schmidt + * AUTHORS: Add me to the authors file * configure.ac: diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index 7743d332d8..049ce7e238 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -216,7 +216,7 @@ gst_alsa_sink_check_event (GstAlsaSink * sink, gint pad_nr) if (pad_nr != 0) { break; } - delay = + delay = (this->format == NULL) ? 0 : GST_SECOND * this->transmitted / this->format->rate - gst_alsa_sink_get_time (this); if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {