diff --git a/ChangeLog b/ChangeLog
index e79f65ab90..531c509780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-16  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Yves Lefebvre <ivanohe at abacom dot com>
+
+	* gst/avi/gstavimux.c: (gst_avi_mux_stop_file):
+	Correctly set the dwLength in strh.
+	With this patch, the file duration is now displayed correctly in window
+	media player and the AVI plays completely. Fixes #356147
+
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
 	Patch by: Darren Kenny <darren dot kenny at sun dot com>
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 82e339b0c8..1f1eb2765d 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1370,7 +1370,7 @@ gst_avi_mux_stop_file (GstAviMux * avimux)
   /* statistics/total_frames/... */
   avimux->avi_hdr.tot_frames = avimux->num_frames;
   if (avimux->video_pad_connected) {
-    avimux->vids_hdr.length = avimux->num_frames;
+    avimux->vids_hdr.length = avimux->total_frames;
   }
   if (avimux->audio_pad_connected) {
     avimux->auds_hdr.length =