diff --git a/ChangeLog b/ChangeLog
index 583f9b91a4..716dcdfbb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-23  Edward Hervey  <edward@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
+	(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
+	Added definitions for FLASHSV, Flash Screen Video format.
+
 2006-09-21  Edward Hervey  <edward@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 491940c003..dddebeb932 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -458,6 +458,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
           "indeoversion", G_TYPE_INT, 2, NULL);
       break;
 
+    case CODEC_ID_FLASHSV:
+      caps = gst_ff_vid_caps_new (context, "video/x-flash-screen", NULL);
+      break;
+
     case CODEC_ID_VP3:
       caps = gst_ff_vid_caps_new (context, "video/x-vp3", NULL);
       break;
@@ -1939,6 +1943,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
   } else if (!strcmp (mimetype, "video/x-vp6-flash")) {
     id = CODEC_ID_VP6F;
     video = TRUE;
+  } else if (!strcmp (mimetype, "video/x-flash-screen")) {
+    id = CODEC_ID_FLASHSV;
+    video = TRUE;
   } else if (!strcmp (mimetype, "video/x-indeo")) {
     gint indeoversion = 0;
 
@@ -2338,6 +2345,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
     case CODEC_ID_VP6F:
       name = "VP6 Flash video";
       break;
+    case CODEC_ID_FLASHSV:
+      name = "Flash Screen Video";
+      break;
     case CODEC_ID_THEORA:
       name = "Theora video";
       break;