diff --git a/ChangeLog b/ChangeLog
index eaacd1be47..150457ade5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-20  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegcodecmap.h:
+	Avoid division by 0 errors.
+
 2005-09-19  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps),
diff --git a/common b/common
index eac450a673..cd4da6a319 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit eac450a673cd1d3a606fe75399d0cd1fcb1d0d7b
+Subproject commit cd4da6a319d9f92d28f7b8a3b412577e6de50b64
diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/ffmpeg/gstffmpegcodecmap.h
index e8e3aa0707..9d884d1033 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.h
+++ b/ext/ffmpeg/gstffmpegcodecmap.h
@@ -155,7 +155,7 @@ gst_ffmpeg_time_gst_to_ff (guint64 time, AVRational base)
 {
   gint64 out;
 
-  if (!GST_CLOCK_TIME_IS_VALID (time)) {
+  if (!GST_CLOCK_TIME_IS_VALID (time) || base.num == 0) {
     out = AV_NOPTS_VALUE;
   } else {
     AVRational bq = { 1, GST_SECOND };