diff --git a/ChangeLog b/ChangeLog
index 27253a66ce..16de5d8bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-27  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/a52dec/gsta52dec.c: (gst_a52dec_loop),
+	(gst_a52dec_change_state):
+	  Don't do sample adjusting anymore, we use float audio now.
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_fixate):
+	  Don't fixate to non-existing properties.
+
 2004-11-27  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/a52dec/gsta52dec.c: (gst_a52dec_channels),
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 557ce6a724..da07ce1ab0 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -598,8 +598,10 @@ gst_audio_convert_fixate (GstPad * pad, const GstCaps * caps)
   }
   if (_fixate_caps_to_int (&copy, "width", try.width))
     return copy;
-  if (_fixate_caps_to_int (&copy, "depth", try.depth))
-    return copy;
+  if (gst_structure_get_name (gst_caps_get_structure (copy, 0))[12] == 'i') {
+    if (_fixate_caps_to_int (&copy, "depth", try.depth))
+      return copy;
+  }
   if (_fixate_caps_to_int (&copy, "endianness", try.endianness))
     return copy;
   if ((pos_val = gst_structure_get_value (gst_caps_get_structure (copy, 0),