diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:22:11 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:22:33 +0200 |
commit | efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (patch) | |
tree | ecab8035e64e2a01bbec67904bee88a601b75130 /libmpdemux | |
parent | d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec (diff) | |
parent | 2e557e3b28add84c060abfae0b7241897be073eb (diff) | |
download | mpv-efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a.tar.bz2 mpv-efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a.tar.xz |
Merge svn r30174
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_mf.c | 2 |
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') }, |