diff options
author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-13 21:36:27 +0000 |
---|---|---|
committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-13 21:36:27 +0000 |
commit | 440d7d25755bc850b7ee58e88e2bd8d6c18baea7 (patch) | |
tree | 2a1da3146e10e9b7e71f82c677e48533a5efc895 | |
parent | 2fdfd41cb5410e2bf55e2c0586e18ca8ed26c55f (diff) | |
download | mpv-440d7d25755bc850b7ee58e88e2bd8d6c18baea7.tar.bz2 mpv-440d7d25755bc850b7ee58e88e2bd8d6c18baea7.tar.xz |
add ffpcx decoder, works on my samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25993 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 8 | ||||
-rw-r--r-- | libmpdemux/demux_mf.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 935ce525c5..9a2caeb3a0 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -177,6 +177,14 @@ videocodec fftiff dll tiff out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 +videocodec ffpcx + info "FFmpeg PCX decoder" + status working + fourcc "pcx " + driver ffmpeg + dll pcx + out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 + videocodec ffpng info "FFmpeg PNG decoder" status working diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index 7a03ba76b5..f460395a9a 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -65,6 +65,7 @@ static const struct { { "bmp", mmioFOURCC('b', 'm', 'p', ' ') }, { "jpeg", mmioFOURCC('I', 'J', 'P', 'G') }, { "jpg", mmioFOURCC('I', 'J', 'P', 'G') }, + { "pcx", mmioFOURCC('p', 'c', 'x', ' ') }, { "png", mmioFOURCC('M', 'P', 'N', 'G') }, { "tga", mmioFOURCC('M', 'T', 'G', 'A') }, { "tif", mmioFOURCC('t', 'i', 'f', 'f') }, |