diff --git a/ChangeLog b/ChangeLog
index e4fb8a64dd..92bc729b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-05  Julien MOUTTE  <julien@moutte.net>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry):
+	Don't leave the offsets defined by upstream element on the
+	compressed data buffer we are pushing downstream. Make them
+	GST_BUFFER_OFFSET_NONE.
+
 2007-04-04  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/avi/README:
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index d52478431c..1cc445e0d7 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -3382,6 +3382,8 @@ gst_avi_demux_process_next_entry (GstAviDemux * avi)
 
     GST_BUFFER_TIMESTAMP (buf) = entry->ts;
     GST_BUFFER_DURATION (buf) = entry->dur;
+    GST_BUFFER_OFFSET (buf) = GST_BUFFER_OFFSET_NONE;
+    GST_BUFFER_OFFSET_END (buf) = GST_BUFFER_OFFSET_NONE;
     gst_buffer_set_caps (buf, GST_PAD_CAPS (stream->pad));
 
     GST_DEBUG_OBJECT (avi, "Pushing buffer of size %d and time %"