Mercurial > libavformat.hg
comparison riff.c @ 5986:bbac6af4238c libavformat
Fix FourCC when remuxing VP6F, regression introduced in r22941.
Patch by Anssi Hannula, anssi D hannula A iki fi
| author | cehoyos |
|---|---|
| date | Wed, 28 Apr 2010 07:57:07 +0000 |
| parents | b8882d9bad80 |
| children | ec720621cd71 |
comparison
equal
deleted
inserted
replaced
| 5985:35c3858d457f | 5986:bbac6af4238c |
|---|---|
| 178 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, | 178 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, |
| 179 { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, | 179 { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, |
| 180 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, | 180 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, |
| 181 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, | 181 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, |
| 182 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, | 182 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, |
| 183 { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, | |
| 183 { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, | 184 { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, |
| 184 { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, | 185 { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, |
| 185 { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, | 186 { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, |
| 186 { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, | 187 { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, |
| 187 { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, | 188 { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, |
| 203 { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, | 204 { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, |
| 204 { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, | 205 { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, |
| 205 { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, | 206 { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, |
| 206 { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, | 207 { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, |
| 207 { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, | 208 { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, |
| 208 { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, | |
| 209 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, | 209 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, |
| 210 { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, | 210 { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, |
| 211 { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, | 211 { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, |
| 212 { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') }, | 212 { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') }, |
| 213 { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') }, | 213 { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') }, |