diff --git a/ChangeLog b/ChangeLog
index 6922bbf12d..f368053627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/faad/gstfaad.c: (clip_outgoing_buffer):
+	Fix buffer clipping to correctly clip to the segment stop.
+
 2007-07-14  Wim Taymans  <wim.taymans@gmail.com>
 
 	Patch by: Hans de Goede <j.w.r.degoede at hhs dot nl>
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 814de23b8a..5863e59056 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -1163,7 +1163,7 @@ clip_outgoing_buffer (GstFaad * faad, GstBuffer * buffer)
       GST_BUFFER_DATA (buffer) += diff;
       GST_BUFFER_SIZE (buffer) -= diff;
     }
-    diff = cstop - stop;
+    diff = stop - cstop;
     if (diff > 0) {
       GST_BUFFER_DURATION (buffer) -= diff;
       /* time->frames->bytes */