diff --git a/ChangeLog b/ChangeLog
index 4c3d32f123..325926b1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-21  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream):
+	Don't calculate the default duration of a frame from the audio sampling
+	rate. This only works for raw audio if every frame contains a single
+	sample and results in broken buffer durations for other formats
+	if no specified default duration is given or the blocks have no
+	duration. Fixes bug #548831.
+
 2008-08-21  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/matroska/matroska-demux.c:
diff --git a/common b/common
index d70ca17ae6..8d494854a6 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45
+Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 0179b4edf6..8e0193d989 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1391,10 +1391,6 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
                 break;
               }
 
-              if (context->default_duration == 0)
-                context->default_duration =
-                    gst_gdouble_to_guint64 ((gdouble) GST_SECOND * (1.0 / num));
-
               GST_DEBUG_OBJECT (demux, "TrackAudioSamplingFrequency: %lf", num);
               audiocontext->samplerate = num;
               break;