summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst-libs/gst/audio/audioclock.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 64b62367..bb14004d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-16 Arwed v. Merkatz <v.merkatz@gmx.net>
+
+ reviewed by: Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst-libs/gst/audio/audioclock.c:
+ Fix wrong return type (#142205).
+
2004-05-16 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/mad/gstmad.c: (gst_mad_class_init), (gst_mad_init):
diff --git a/gst-libs/gst/audio/audioclock.c b/gst-libs/gst/audio/audioclock.c
index f66f4eba..75c4c1c5 100644
--- a/gst-libs/gst/audio/audioclock.c
+++ b/gst-libs/gst/audio/audioclock.c
@@ -30,7 +30,7 @@ static void gst_audio_clock_class_init (GstAudioClockClass * klass);
static void gst_audio_clock_init (GstAudioClock * clock);
static GstClockTime gst_audio_clock_get_internal_time (GstClock * clock);
-static GstClockReturn gst_audio_clock_id_wait_async (GstClock * clock,
+static GstClockEntryStatus gst_audio_clock_id_wait_async (GstClock * clock,
GstClockEntry * entry);
static void gst_audio_clock_id_unschedule (GstClock * clock,
GstClockEntry * entry);
@@ -174,7 +174,7 @@ compare_clock_entries (GstClockEntry * entry1, GstClockEntry * entry2)
return entry1->time - entry2->time;
}
-static GstClockReturn
+static GstClockEntryStatus
gst_audio_clock_id_wait_async (GstClock * clock, GstClockEntry * entry)
{
GstAudioClock *aclock = (GstAudioClock *) clock;