diff --git a/ChangeLog b/ChangeLog
index a6235d6c68..72dc73c479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-14  Wim Taymans  <wim@fluendo.com>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_massage_index):
+	Disable init_frames delay timestamp adjustment, it does not
+	seem to be needed at all. Fixes #369621.
+
 2006-11-13  Wim Taymans  <wim@fluendo.com>
 
 	Patch by: Mark Nauwelaerts  <manauw at skynet be>
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index ed94fb2148..fa0ca01698 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -2051,15 +2051,21 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
 {
   gst_avi_index_entry *entry;
   avi_stream_context *stream;
-  guint32 avih_init_frames;
-  guint32 init_frames;
   gint i;
   GList *one;
+
+#if 0
+  guint32 avih_init_frames;
+  guint32 init_frames;
   GstFormat fmt = GST_FORMAT_TIME;
+#endif
   gint64 delay = 0;
 
   GST_LOG_OBJECT (avi, "Starting index massage");
 
+  /* the init_frames have no real meaning except to indicate how much
+   * audio preroll there is to fill up the audio device */
+#if 0
   avih_init_frames = avi->avih->init_frames;
 
   /* init frames, add constant delay for each index entry */
@@ -2086,6 +2092,7 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
         entry->ts += delay;
     }
   }
+#endif
 
   GST_LOG_OBJECT (avi, "I'm now going to cut large chunks into smaller pieces");