diff --git a/ChangeLog b/ChangeLog
index 0c78b4f50a..7df40d063f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-30  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
+	(gst_ffmpeg_pixfmt_to_caps), (gst_ffmpeg_caps_to_pixfmt):
+	  Patch from Eric Jonas to support conversions to/from UYVY 
+	  (Fixes: #324626)
+
 2006-01-30  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/playback/gstplaybasebin.c: (group_commit), (queue_overrun),
diff --git a/gst/ffmpegcolorspace/gstffmpegcodecmap.c b/gst/ffmpegcolorspace/gstffmpegcodecmap.c
index 36acc1b842..571d16abe8 100644
--- a/gst/ffmpegcolorspace/gstffmpegcodecmap.c
+++ b/gst/ffmpegcolorspace/gstffmpegcodecmap.c
@@ -132,6 +132,9 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context)
     case PIX_FMT_YUV422:
       fmt = GST_MAKE_FOURCC ('Y', 'U', 'Y', '2');
       break;
+    case PIX_FMT_UYVY422:
+      fmt = GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y');
+      break;
     case PIX_FMT_RGB24:
       bpp = depth = 24;
       endianness = G_BIG_ENDIAN;
@@ -475,6 +478,9 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
         case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
           context->pix_fmt = PIX_FMT_YUV422;
           break;
+        case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
+          context->pix_fmt = PIX_FMT_UYVY422;
+          break;
         case GST_MAKE_FOURCC ('I', '4', '2', '0'):
           context->pix_fmt = PIX_FMT_YUV420P;
           break;