summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--gst/gstclock.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d59a62c8..642ce89d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-24 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst/gstclock.h:
+ Well, that's embarassing. Luckily we weren't using
+ GST_CLOCK_DIFF anywhere.
+
2005-09-23 Thomas Vander Stichele <thomas at apestaart dot org>
* common/gtk-doc.mak:
diff --git a/common b/common
-Subproject c7160d5b7c76f00609cf7b6e9b782e99f626686
+Subproject 7caeee4b949b4388927fec7fcf25f767429bde3
diff --git a/gst/gstclock.h b/gst/gstclock.h
index f943eb777..cf5848db0 100644
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -104,7 +104,7 @@ typedef gpointer GstClockID;
*
* Calculate a difference between two clock times as a #GstClockTimeDiff.
*/
-#define GST_CLOCK_DIFF(s, e) (GstClockTimeDiff)((s) - (e))
+#define GST_CLOCK_DIFF(s, e) (GstClockTimeDiff)((e) - (s))
/**
* GST_TIMEVAL_TO_TIME: