diff --git a/ChangeLog b/ChangeLog
index 5e11bc9a20..dc55b618d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-27  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/base/gstbasetransform.c: (gst_base_transform_transform_size):
+          fix div-by-zero
+
 2005-08-26  Andy Wingo  <wingo@pobox.com>
 
 	* check/pipelines/simple_launch_lines.c (run_pipeline): Check
diff --git a/gst/base/gstbasetransform.c b/gst/base/gstbasetransform.c
index 7f7544873e..300fe87b9c 100644
--- a/gst/base/gstbasetransform.c
+++ b/gst/base/gstbasetransform.c
@@ -282,6 +282,7 @@ gst_base_transform_transform_size (GstBaseTransform * trans,
             &inunitsize), FALSE);
     GST_DEBUG_OBJECT (trans, "input size %d, input unit size %d", size,
         inunitsize);
+    g_return_val_if_fail (inunitsize != 0, FALSE);
     g_return_val_if_fail (size % inunitsize == 0, FALSE);
 
     units = size / inunitsize;
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 7f7544873e..300fe87b9c 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -282,6 +282,7 @@ gst_base_transform_transform_size (GstBaseTransform * trans,
             &inunitsize), FALSE);
     GST_DEBUG_OBJECT (trans, "input size %d, input unit size %d", size,
         inunitsize);
+    g_return_val_if_fail (inunitsize != 0, FALSE);
     g_return_val_if_fail (size % inunitsize == 0, FALSE);
 
     units = size / inunitsize;