diff --git a/ChangeLog b/ChangeLog
index 3375779391..9242ad0e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-28  Edward Hervey  <edward@fluendo.com>
+
+	* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_change_state):
+	Initialize segment to GST_FORMAT_UNDEFINED in READY->PAUSED.
+
 2006-05-28  Edward Hervey  <edward@fluendo.com>
 
 	* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_finalize),
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 1713b06f2a..c22c4cd60c 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -1062,7 +1062,7 @@ gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition)
       dec->caps_height = -1;
       dec->packetized = FALSE;
       dec->next_ts = 0;
-      gst_segment_init (dec->segment, GST_FORMAT_TIME);
+      gst_segment_init (dec->segment, GST_FORMAT_UNDEFINED);
     default:
       break;
   }