Mercurial > libavformat.hg

comparison riff.c @ 5307:99be640a6672 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FourCC mjpa as MJPEG. Fixes issue 1492.
author cehoyos
date Sun, 18 Oct 2009 22:43:19 +0000
parents 0d5653941bf9
children 653730591c20
comparison
equal deleted inserted replaced
5306:95a0faec0218 5307:99be640a6672
117 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, 117 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
118 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ 118 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
119 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, 119 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
120 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, 120 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
121 { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, 121 { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
122 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
122 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, 123 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
123 { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ 124 { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
124 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ 125 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
125 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ 126 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
126 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, 127 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },