diff --git a/ChangeLog b/ChangeLog
index cfa9ffe2c7..479bdaa1fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-27  Luca Ognibene  <luogni@tin.it>
+
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop):
+	timestamp is a GstClockTime, not a double..
+	fix #309149 and maybe others bug
+
 2005-06-27  Daniel Fischer  <dan@f3c.com>
 
 	reviewed by: Luca Ognibene <luogni@tin.it>
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 3b714c095a..3677d59607 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -656,7 +656,7 @@ gst_ffmpegdemux_loop (GstElement * element)
     GST_BUFFER_SIZE (outbuf) = pkt.size;
 
     if (pkt.pts != AV_NOPTS_VALUE) {
-      GST_BUFFER_TIMESTAMP (outbuf) = (gdouble) (pkt.pts +
+      GST_BUFFER_TIMESTAMP (outbuf) = (GstClockTime) (pkt.pts +
           stream->start_time) * GST_SECOND / AV_TIME_BASE;
       demux->last_ts[stream->index] = GST_BUFFER_TIMESTAMP (outbuf);
     }