diff --git a/ChangeLog b/ChangeLog
index cab5a7d3ce..d24f9e9a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/volume/gstvolume.c: (volume_process_int16),
+	(volume_process_int16_clamp), (volume_set_caps):
+	  Unbreak volume, value remains gint.
+
 2007-02-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/volume/gstvolume.c: (volume_choose_func),
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 100b662759..82e1232a43 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -412,7 +412,8 @@ static void
 volume_process_int16 (GstVolume * this, gpointer bytes, guint n_bytes)
 {
   gint16 *data = (gint16 *) bytes;
-  guint i, val, num_samples;
+  guint i, num_samples;
+  gint val;
 
   num_samples = n_bytes / sizeof (gint16);
 
@@ -432,7 +433,8 @@ static void
 volume_process_int16_clamp (GstVolume * this, gpointer bytes, guint n_bytes)
 {
   gint16 *data = (gint16 *) bytes;
-  guint i, val, num_samples;
+  guint i, num_samples;
+  gint val;
 
   num_samples = n_bytes / sizeof (gint16);
 
@@ -470,10 +472,10 @@ volume_set_caps (GstBaseTransform * base, GstCaps * incaps, GstCaps * outcaps)
   /* based on mimetype, choose the correct volume_process format */
   if (strcmp (mimetype, "audio/x-raw-int") == 0) {
     this->format = GST_VOLUME_FORMAT_INT;
-    GST_DEBUG_OBJECT (this, "use int");
+    GST_DEBUG_OBJECT (this, "use int: %u", this->width);
   } else if (strcmp (mimetype, "audio/x-raw-float") == 0) {
     this->format = GST_VOLUME_FORMAT_FLOAT;
-    GST_DEBUG_OBJECT (this, "use float");
+    GST_DEBUG_OBJECT (this, "use float: %u", this->width);
   } else {
     this->process = NULL;
     goto invalid_format;