diff --git a/etc/codecs.conf b/etc/codecs.conf
index 9a2caeb3a0..ecb8923e2b 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -228,6 +228,14 @@ videocodec sgi
   driver sgi
   out BGR24
 
+videocodec ffsunras
+  info "FFmpeg SUN Rasterfile decoder"
+  status working
+  fourcc "sun " ; sun is an internal MPlayer FOURCC
+  driver ffmpeg
+  dll sunrast
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+
 videocodec ffindeo3
   info "FFmpeg Intel Indeo 3.1/3.2"
   status working
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index f460395a9a..ae2a839dae 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -70,6 +70,13 @@ static const struct {
   { "tga",  mmioFOURCC('M', 'T', 'G', 'A') },
   { "tif",  mmioFOURCC('t', 'i', 'f', 'f') },
   { "sgi",  mmioFOURCC('S', 'G', 'I', '1') },
+  { "sun",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "ras",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "ra",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "im1",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "im8",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "im24",  mmioFOURCC('s', 'u', 'n', ' ') },
+  { "sunras",  mmioFOURCC('s', 'u', 'n', ' ') },
   { NULL,   0 }
 };