Mercurial > mplayer.hg

changeset 34499:7247b323cfc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demux_mf: add j2c and jpc as jpeg2k, add tiff extension as tif image.
author compn
date Sun, 22 Jan 2012 00:29:56 +0000
parents db70ec64faf6
children b8c768d93a55
files libmpdemux/demux_mf.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mf.c	Sat Jan 21 19:15:03 2012 +0000
+++ b/libmpdemux/demux_mf.c	Sun Jan 22 00:29:56 2012 +0000
@@ -83,8 +83,10 @@
 } 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') },
   { "jls",  mmioFOURCC('I', 'J', 'P', 'G') },
@@ -95,6 +97,7 @@
   { "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', ' ') },