diff --git a/ChangeLog b/ChangeLog
index 622dd1563c..d6f472559e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07  David Schleef  <ds@schleef.org>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
+	Add cinepak format.  (bug #136470)
+
 2004-03-05  David Schleef  <ds@schleef.org>
 
 	* configure.ac:  Call ffmpeg's configure with --disable-v4l,
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 000c608bdc..dd8e054a27 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -395,6 +395,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID    codec_id,
           NULL);
       break;
 
+    case CODEC_ID_CINEPAK:
+      caps = GST_FF_VID_CAPS_NEW ("video/x-cinepak", NULL);
+      break;
+
     default:
       /* .. */
       break;