diff --git a/ChangeLog b/ChangeLog
index b7f40c1de0..f5c4d95ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-22  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* libs/gst/controller/gstinterpolation.c:
+	Use an array of the correct type when using _get_value_array with
+	linear interpolation.
+
 2007-05-22  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/gstelement.c (gst_element_requires_clock,
diff --git a/libs/gst/controller/gstinterpolation.c b/libs/gst/controller/gstinterpolation.c
index e652e4dbb1..76fa1e80ee 100644
--- a/libs/gst/controller/gstinterpolation.c
+++ b/libs/gst/controller/gstinterpolation.c
@@ -316,7 +316,7 @@ interpolate_linear_get_##type##_value_array (GstControlledProperty * prop, \
 { \
   gint i; \
   GstClockTime ts = timestamp; \
-  gint *values = (gint *) value_array->values; \
+  g##type *values = (g##type *) value_array->values; \
   \
   for(i = 0; i < value_array->nbsamples; i++) { \
     *values = _interpolate_linear_get_##type (prop, ts); \