Index: gst/ffmpegcolorspace/gstffmpegcolorspace.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst/ffmpegcolorspace/gstffmpegcolorspace.c,v
retrieving revision 1.43
diff -u -r1.43 gstffmpegcolorspace.c
--- gst/ffmpegcolorspace/gstffmpegcolorspace.c	22 Nov 2005 16:08:37 -0000	1.43
+++ gst/ffmpegcolorspace/gstffmpegcolorspace.c	15 Jan 2006 02:59:10 -0000
@@ -366,6 +366,7 @@
   GstStructure *structure = NULL;
   AVCodecContext *ctx = NULL;
   gint width, height;
+  gboolean palette_in_frame;
 
   g_return_val_if_fail (size, FALSE);
 
@@ -383,7 +384,9 @@
 
   *size = avpicture_get_size (ctx->pix_fmt, width, height);
 
-  if (space->palette)
+  if ((!gst_structure_get_boolean (structure, "palette_in_frame", &palette_in_frame)
+      || !palette_in_frame)
+      && space->palette)
     *size -= 4 * 256;
 
   av_free (ctx);
Index: gst-libs/gst/riff/riff-media.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-media.c,v
retrieving revision 1.50
diff -u -r1.50 riff-media.c
--- gst-libs/gst/riff/riff-media.c	20 Dec 2005 10:13:05 -0000	1.50
+++ gst-libs/gst/riff/riff-media.c	15 Jan 2006 02:59:11 -0000
@@ -338,6 +338,7 @@
           "msvideoversion", G_TYPE_INT, 1, NULL);
       if (codec_name)
         *codec_name = g_strdup ("MS video v1");
+      palette = strf_data;
       break;
 
     case GST_MAKE_FOURCC ('R', 'L', 'E', ' '):
