Mercurial > libavformat.hg

comparison riff.c @ 2107:d422ebae6dd1 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move jpegls up, fixes sf bug #1629152
author michael
date Wed, 30 May 2007 23:42:37 +0000
parents 8b400be65542
children 5bd95162a3a2
comparison
equal deleted inserted replaced
2106:eb66f83e9562 2107:d422ebae6dd1
99 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, 99 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
100 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, 100 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
101 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, 101 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
102 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, 102 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
103 { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ 103 { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
104 { CODEC_ID_JPEGLS,MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
104 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ 105 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
105 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, 106 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
106 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, 107 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
107 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, 108 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
108 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
109 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, 109 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
110 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, 110 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
111 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, 111 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
112 { CODEC_ID_RAWVIDEO, 0 }, 112 { CODEC_ID_RAWVIDEO, 0 },
113 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, 113 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },