diff --git a/ChangeLog b/ChangeLog
index 7c1b4a7daf454f1df2c0c3d6f85c3f773a28c886..12d7dab06b396ebdf541c14242cda83b8808def9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-06  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
+
+	Based on a patch by: Aurelien Grimaud <gstelzz at yahoo dot fr>
+
+	* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_collected):
+	Properly convert buffer duration to an ffmpeg packet duration.
+	Fixes #371939.
+
 2008-07-01  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* ext/ffmpeg/gstffmpegdec.c:
diff --git a/common b/common
index d9cd98b46aebaf143dc43d8563a3bff650be6a7e..593bb114c6f5c32b529aa6443be4c2d60d6484c7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d9cd98b46aebaf143dc43d8563a3bff650be6a7e
+Subproject commit 593bb114c6f5c32b529aa6443be4c2d60d6484c7
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index c3be3cd1ecd69ebbf161bb2de9516173f45a9684..ff4b7faf6e3fcdca05f833c0c0ca06ee0caf2ef6 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -569,8 +569,8 @@ gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
 
     if (GST_BUFFER_DURATION_IS_VALID (buf))
       pkt.duration =
-          gst_util_uint64_scale_int (GST_BUFFER_DURATION (buf), AV_TIME_BASE,
-          GST_SECOND);
+          gst_ffmpeg_time_gst_to_ff (GST_BUFFER_DURATION (buf),
+              ffmpegmux->context->streams[best_pad->padnum]->time_base);
     else
       pkt.duration = 0;
     av_write_frame (ffmpegmux->context, &pkt);