diff --git a/ChangeLog b/ChangeLog
index 5c888157a3..e03a72cff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-20  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/audioconvert/gstaudioconvert.c:
+	(gst_audio_convert_get_unit_size), (set_structure_widths):
+        Lower debug, use g_assert in _get_unit_size
+
+	* gst/audioresample/gstaudioresample.c:
+	(audioresample_get_unit_size):
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcsp_get_unit_size):
+	* gst/videoscale/gstvideoscale.c: (gst_video_scale_get_unit_size):
+	  use g_assert in _get_unit_size
+
 2006-08-18  Wim Taymans  <wim@fluendo.com>
 
 	* docs/libs/gst-plugins-base-libs-sections.txt:
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 67f78724bd..8cb2becbd2 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -299,7 +299,7 @@ gst_audio_convert_get_unit_size (GstBaseTransform * base, GstCaps * caps,
 {
   AudioConvertFmt fmt = { 0 };
 
-  g_return_val_if_fail (size, FALSE);
+  g_assert (size);
 
   if (!gst_audio_convert_parse_caps (caps, &fmt))
     goto parse_error;
@@ -399,7 +399,7 @@ set_structure_widths (GstStructure * s, int min, int max)
   for (width = min; width <= max; width += 8) {
     g_value_set_int (&val, width);
     gst_value_list_append_value (&list, &val);
-    GST_DEBUG ("Appended width %d to widths available", width);
+    GST_LOG ("Appended width %d to widths available", width);
   }
   gst_structure_set_value (s, "width", &list);
   g_value_unset (&val);
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index c878d02eb4..5954b2b707 100644
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -237,7 +237,7 @@ audioresample_get_unit_size (GstBaseTransform * base, GstCaps * caps,
   GstStructure *structure;
   gboolean ret;
 
-  g_return_val_if_fail (size, FALSE);
+  g_assert (size);
 
   /* this works for both float and int */
   structure = gst_caps_get_structure (caps, 0);
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index 197071aa71..b3a0b72532 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -384,7 +384,7 @@ gst_ffmpegcsp_get_unit_size (GstBaseTransform * btrans, GstCaps * caps,
   AVCodecContext *ctx = NULL;
   gint width, height;
 
-  g_return_val_if_fail (size, FALSE);
+  g_assert (size);
 
   space = GST_FFMPEGCSP (btrans);
 
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index 2694834bff..df03142fe9 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -532,7 +532,7 @@ gst_video_scale_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
   gint format, width, height;
   VSImage img;
 
-  g_return_val_if_fail (size, FALSE);
+  g_assert (size);
 
   videoscale = GST_VIDEO_SCALE (trans);