summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-25 18:30:02 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-25 18:30:02 +0000
commit6b9a3bc1a4f965c7c87c1c4e6b0d8e4854dd6f24 (patch)
treec4edb8dd45aba2f7c7d38cf44db9ff7dd852b70a
parent21c200e767312f3fe2d335a3e4cb2597cfdd0cfb (diff)
downloadmpv-6b9a3bc1a4f965c7c87c1c4e6b0d8e4854dd6f24.tar.bz2
mpv-6b9a3bc1a4f965c7c87c1c4e6b0d8e4854dd6f24.tar.xz
sun rasterfile decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26102 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpdemux/demux_mf.c7
2 files changed, 15 insertions, 0 deletions
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 }
};