diff --git a/ChangeLog b/ChangeLog
index e832aace33..0a742f090e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-18  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_chain):
+          don't critical, throw error (#137588)
+
 2004-03-16  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: bump nano to 1
diff --git a/common b/common
index af639632ef..99901894a4 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit af639632ef610fb83ee7a07bead59459986741f9
+Subproject commit 99901894a48091bfed16826702c38c4063e64954
diff --git a/ext/ffmpeg/gstffmpegcolorspace.c b/ext/ffmpeg/gstffmpegcolorspace.c
index d27aebbf8e..ff00f792cc 100644
--- a/ext/ffmpeg/gstffmpegcolorspace.c
+++ b/ext/ffmpeg/gstffmpegcolorspace.c
@@ -341,7 +341,8 @@ gst_ffmpegcsp_chain (GstPad  *pad,
 
   if (space->from_pixfmt == PIX_FMT_NB ||
       space->to_pixfmt == PIX_FMT_NB) {
-    g_critical ("attempting to convert unknown formats");
+    GST_ELEMENT_ERROR (space, CORE, NOT_IMPLEMENTED, NULL,
+         ("attempting to convert colorspaces between unknown formats"));
     gst_buffer_unref (inbuf);
     return;
   }