summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-03 00:58:56 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-03 00:58:56 +0000
commit2e557e3b28add84c060abfae0b7241897be073eb (patch)
treef6af805cc0d8a0dbc47d43ac64e6a67d3d7609ae /libmpdemux
parent1d3fd9e1ea720c23076268cb69fa2c4245dd9109 (diff)
downloadmpv-2e557e3b28add84c060abfae0b7241897be073eb.tar.bz2
mpv-2e557e3b28add84c060abfae0b7241897be073eb.tar.xz
Add support for JPEG2000 via FFmpeg/OpenJPEG
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index 9320c544ff..fa9b8ae630 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -83,6 +83,8 @@ static const struct {
} type2format[] = {
{ "bmp", mmioFOURCC('b', 'm', 'p', ' ') },
{ "dpx", mmioFOURCC('d', 'p', 'x', ' ') },
+ { "j2k", mmioFOURCC('M', 'J', '2', 'C') },
+ { "jp2", mmioFOURCC('M', 'J', '2', 'C') },
{ "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jpg", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jls", mmioFOURCC('I', 'J', 'P', 'G') },