diff --git a/ChangeLog b/ChangeLog
index 97e785b2c5..2f0fadda79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-13  Edward Hervey  <edward@fluendo.com>
+
+	* gst/flx/gstflxdec.c: (gst_flxdec_chain): 
+	If the speed of the file is null in the header, set the frame_time to the default
+	setting of GST_SECOND / 70. Which is the default frame_delay for .fli files as
+	stated in this document : http://www.compuphase.com/flic.htm
+	Would be nice to have the time conversion done properly too
+	(duration = flxh->frames * flxdec->frame_time)
+
 2005-12-12  Julien MOUTTE  <julien@moutte.net>
 
 	* docs/plugins/Makefile.am:
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 0e6a9dd98b..06f7ec4f26 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -492,6 +492,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
 
       if (flxh->type == FLX_MAGICHDR_FLI) {
         flxdec->frame_time = JIFFIE * flxh->speed;
+      } else if (flxh->speed == 0) {
+        flxdec->frame_time = GST_SECOND / 70;
       } else {
         flxdec->frame_time = flxh->speed * GST_MSECOND;
       }