diff --git a/ChangeLog b/ChangeLog
index 1da6ea7010..067383a655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-10  Edward Hervey  <edward@fluendo.com>
+
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
+	(gst_riff_create_video_template_caps):
+	Added FLV1 <==> 'video/x-flash-video,flvversion=1' conversion.
+	Also added the caps to the default set of riff video caps.
+
 2006-02-09  Andy Wingo  <wingo@pobox.com>
 
 	* ext/ogg/gstoggmux.c (GstOggPad): Keep track of both the start
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 7b2f80fd7c..6b231c162d 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -494,6 +494,13 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("PNG image");
       break;
 
+    case GST_MAKE_FOURCC ('F', 'L', 'V', '1'):
+      caps = gst_caps_new_simple ("video/x-flash-video",
+          "flvversion", G_TYPE_INT, 1, NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("Flash Video 1");
+      break;
+
     default:
       GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
           GST_FOURCC_ARGS (codec_fcc));
@@ -807,6 +814,7 @@ gst_riff_create_video_template_caps (void)
     GST_MAKE_FOURCC ('S', 'P', '5', '3'),
     GST_MAKE_FOURCC ('P', 'N', 'G', ' '),
     GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'),
+    GST_MAKE_FOURCC ('F', 'L', 'V', '1'),
     /* FILL ME */
     0
   };