diff --git a/ChangeLog b/ChangeLog
index 67434efaae..f3f7935b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_chain):
+	  Fix crash when outputting debugging information for certain
+	  pictures (always good to use the right struct member for
+	  the number of records in an array).
+
 2006-05-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Jindrich Makovicka  <jindrich.makivicka at itonis tv>
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 55704f681d..349b8a541e 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -774,7 +774,7 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf)
 
   GST_DEBUG ("num_components=%d, comps_in_scan=%d\n",
       dec->cinfo.num_components, dec->cinfo.comps_in_scan);
-  for (i = 0; i < dec->cinfo.num_components; ++i) {
+  for (i = 0; i < dec->cinfo.comps_in_scan; ++i) {
     GST_DEBUG ("[%d] h_samp_factor=%d, v_samp_factor=%d\n", i,
         dec->cinfo.cur_comp_info[i]->h_samp_factor,
         dec->cinfo.cur_comp_info[i]->v_samp_factor);