diff --git a/ChangeLog b/ChangeLog
index d40d320338..330d3aa555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/alsa/gstalsa.h:
+	  Remove unused entry.
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
+	  Add cinepak.
+	* gst/videodrop/gstvideodrop.c: (gst_videodrop_getcaps),
+	(gst_videodrop_link), (gst_videodrop_chain):
+	  Fix, sort of. Was horribly broken with new capsnego. Bah...
+
 2004-03-23  Jeremy Simon  <jesimon@libertysurf.fr>
 
 	* gst/typefind/gsttypefindfunctions.c: (ape_type_find),
diff --git a/ext/alsa/gstalsa.h b/ext/alsa/gstalsa.h
index 96c4e061a4..9b9c9d1ee5 100644
--- a/ext/alsa/gstalsa.h
+++ b/ext/alsa/gstalsa.h
@@ -135,7 +135,6 @@ struct _GstAlsa {
   gchar *			device;
   gchar *                       cardname;
   snd_pcm_t *			handle;
-  snd_pcm_info_t *		info;
   guint				pcm_caps;	/* capabilities of the pcm device, see GstAlsaPcmCaps */
   snd_output_t *		out;
 
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 042651a9ea..5e531997d2 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -201,6 +201,12 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("Windows Media Video 9");
       break;
 
+    case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
+      caps = gst_caps_new_simple ("video/x-cinepak", NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("Cinepak video");
+      break;
+
     default:
       GST_WARNING ("Unkown video fourcc " GST_FOURCC_FORMAT,
           GST_FOURCC_ARGS (codec_fcc));