summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormplayer-svn <svn@mplayerhq.hu>2012-01-22 00:29:56 +0000
committerwm4 <wm4@nowhere>2012-08-03 01:43:44 +0200
commitf200c8590687eb55e1008dff1fb5e10d2ff23783 (patch)
tree4867b7088ad69a54a2d4ef9045d77e959a2721da
parent0461f5e669acf1a90af7a8636a72ede9f1c5951a (diff)
downloadmpv-f200c8590687eb55e1008dff1fb5e10d2ff23783.tar.bz2
mpv-f200c8590687eb55e1008dff1fb5e10d2ff23783.tar.xz
demux_mf: add j2c and jpc as jpeg2k, add tiff extension as tif image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34587 b3059339-0415-0410-9bf9-f77b7e298cf2 demux_mf: add JPS/PNS image formats add jps / pns image formats, sync'd from ffmpeg samples: http://i2.i-2000.com/~siragusa/jpsvpns/data/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34642 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: compn
-rw-r--r--libmpdemux/demux_mf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index 7112fd4059..6f0f0de897 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -84,18 +84,23 @@ static const struct {
} type2format[] = {
{ "bmp", mmioFOURCC('b', 'm', 'p', ' ') },
{ "dpx", mmioFOURCC('d', 'p', 'x', ' ') },
+ { "j2c", mmioFOURCC('M', 'J', '2', 'C') },
{ "j2k", mmioFOURCC('M', 'J', '2', 'C') },
{ "jp2", mmioFOURCC('M', 'J', '2', 'C') },
+ { "jpc", mmioFOURCC('M', 'J', '2', 'C') },
{ "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jpg", mmioFOURCC('I', 'J', 'P', 'G') },
+ { "jps", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jls", mmioFOURCC('I', 'J', 'P', 'G') },
{ "thm", mmioFOURCC('I', 'J', 'P', 'G') },
{ "db", mmioFOURCC('I', 'J', 'P', 'G') },
{ "pcx", mmioFOURCC('p', 'c', 'x', ' ') },
{ "png", mmioFOURCC('M', 'P', 'N', 'G') },
+ { "pns", mmioFOURCC('M', 'P', 'N', 'G') },
{ "ptx", mmioFOURCC('p', 't', 'x', ' ') },
{ "tga", mmioFOURCC('M', 'T', 'G', 'A') },
{ "tif", mmioFOURCC('t', 'i', 'f', 'f') },
+ { "tiff", mmioFOURCC('t', 'i', 'f', 'f') },
{ "sgi", mmioFOURCC('S', 'G', 'I', '1') },
{ "sun", mmioFOURCC('s', 'u', 'n', ' ') },
{ "ras", mmioFOURCC('s', 'u', 'n', ' ') },