diff --git a/ChangeLog b/ChangeLog
index 26471e558f..7f56b608f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-09  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/divx/gstdivxenc.c: (gst_divxenc_init):
+	  Use explicit caps - fix capsnego.
+	* ext/xvid/gstxviddec.c:
+	* ext/xvid/gstxvidenc.c:
+	  Remove macro-inside-macro which caused compile errors.
+	* gst-libs/gst/riff/riff-read.c: (gst_riff_read_header):
+	  Error out if it's not a RIFF file. Else we error out without
+	  gst_element_error() which is not good...
+
 2004-01-08  David Schleef  <ds@schleef.org>
 
 	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect):
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 815b3a7b68..ca09a52680 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -845,7 +845,8 @@ gst_riff_read_header (GstRiffRead *riff,
   if (!gst_riff_peek_head (riff, &tag, &length, NULL))
     return FALSE;
   if (tag != GST_RIFF_TAG_RIFF) {
-    GST_WARNING ("Not a RIFF file");
+    gst_element_error (GST_ELEMENT (riff),
+		       "Not a RIFF file");
     return FALSE;
   }
   gst_bytestream_flush_fast (riff->bs, 8);