diff --git a/ChangeLog b/ChangeLog
index 8509028cfa..b8cc2a0f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-19  Wim Taymans  <wim@fluendo.com>
+
+	* gst/flx/gstflxdec.c: (gst_flxdec_src_query_handler),
+	(gst_flxdec_chain):
+	* gst/flx/gstflxdec.h:
+	Implement DURATION query.
+
 2006-02-19  Wim Taymans  <wim@fluendo.com>
 
 	* gst/flx/flx_color.h:
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 456ae5c1b6..9401249f14 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -526,6 +526,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
       }
 
       flxdec->duration = flxh->frames * flxdec->frame_time;
+      GST_LOG ("duration   :  %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (flxdec->duration));
 
       caps = gst_caps_from_string (GST_VIDEO_CAPS_xRGB_HOST_ENDIAN);
       gst_caps_set_simple (caps,
diff --git a/gst/flx/gstflxdec.h b/gst/flx/gstflxdec.h
index 16e7b8ebf2..a47413e0d8 100644
--- a/gst/flx/gstflxdec.h
+++ b/gst/flx/gstflxdec.h
@@ -47,7 +47,7 @@ struct _GstFlxDec {
   GstAdapter *adapter;
   gulong size;
   GstFlxDecState state;
-  glong frame_time;
+  gint64 frame_time;
   gint64 next_time;
   gint64 duration;