Mercurial > libavformat.hg
comparison riff.c @ 4072:b9bb53432c60 libavformat
add 'ACDV' FourCC (which is just complete JPEG files in individual AVI
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)
author | melanson |
---|---|
date | Thu, 11 Dec 2008 07:49:05 +0000 |
parents | a1f5c4042d4f |
children | 96cf19bbdbdc |
comparison
equal
deleted
inserted
replaced
4071:a1f5c4042d4f | 4072:b9bb53432c60 |
---|---|
109 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ | 109 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ |
110 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ | 110 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ |
111 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, | 111 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, |
112 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, | 112 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, |
113 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, | 113 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, |
114 { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, | |
114 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, | 115 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, |
115 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, | 116 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, |
116 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, | 117 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |
117 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, | 118 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, |
118 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, | 119 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, |
180 { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, | 181 { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, |
181 { CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') }, | 182 { CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') }, |
182 { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, | 183 { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, |
183 { CODEC_ID_CLJR, MKTAG('c', 'l', 'j', 'r') }, | 184 { CODEC_ID_CLJR, MKTAG('c', 'l', 'j', 'r') }, |
184 { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, | 185 { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, |
186 { CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') }, | |
185 { CODEC_ID_NONE, 0 } | 187 { CODEC_ID_NONE, 0 } |
186 }; | 188 }; |
187 | 189 |
188 const AVCodecTag codec_wav_tags[] = { | 190 const AVCodecTag codec_wav_tags[] = { |
189 { CODEC_ID_PCM_S16LE, 0x0001 }, | 191 { CODEC_ID_PCM_S16LE, 0x0001 }, |