diff options
| author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-12 02:09:47 +0000 |
|---|---|---|
| committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-12 02:09:47 +0000 |
| commit | 6d1481e91bb5cc8eff338510737c457a43bdfd6f (patch) | |
| tree | c9d40c80941c7300219c6121e3f3a09789babc44 | |
| parent | 8a5ba8d99c552da36a74a91082f095378c9f5602 (diff) | |
| download | mpv-6d1481e91bb5cc8eff338510737c457a43bdfd6f.tar.bz2 mpv-6d1481e91bb5cc8eff338510737c457a43bdfd6f.tar.xz | |
add ffptx , works on ptx samples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 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 0d51cdd853..f1c6d8880e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -218,6 +218,14 @@ videocodec mpng driver mpng out BGR32,BGR24,BGR8,Y800 +videocodec ffptx + info "FFmpeg V.Flash PTX decoder" + status working + fourcc "ptx " + driver ffmpeg + dll ptx + out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 + videocodec fftga info "FFmpeg TGA decoder" status untested diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index ae2a839dae..f7c241feed 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -67,6 +67,7 @@ static const struct { { "jpg", mmioFOURCC('I', 'J', 'P', 'G') }, { "pcx", mmioFOURCC('p', 'c', 'x', ' ') }, { "png", mmioFOURCC('M', 'P', 'N', 'G') }, + { "ptx", mmioFOURCC('p', 't', 'x', ' ') }, { "tga", mmioFOURCC('M', 'T', 'G', 'A') }, { "tif", mmioFOURCC('t', 'i', 'f', 'f') }, { "sgi", mmioFOURCC('S', 'G', 'I', '1') }, |