Mercurial > libavformat.hg

comparison riff.c @ 1472:49d5a5ca2987 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
author bcoudurier
date Thu, 09 Nov 2006 11:37:30 +0000
parents ca301b0f2c7d
children 70ed1bf0ae45
comparison
equal deleted inserted replaced
1471:ad18f1010f47 1472:49d5a5ca2987
184 { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */ 184 { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */
185 { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */ 185 { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
186 { CODEC_ID_WMAV1, 0x160 }, 186 { CODEC_ID_WMAV1, 0x160 },
187 { CODEC_ID_WMAV2, 0x161 }, 187 { CODEC_ID_WMAV2, 0x161 },
188 { CODEC_ID_AAC, 0x706d }, 188 { CODEC_ID_AAC, 0x706d },
189 { CODEC_ID_MPEG4AAC, 0xff }, 189 { CODEC_ID_AAC, 0xff },
190 { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? 190 { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
191 { CODEC_ID_SONIC, 0x2048 }, 191 { CODEC_ID_SONIC, 0x2048 },
192 { CODEC_ID_SONIC_LS, 0x2048 }, 192 { CODEC_ID_SONIC_LS, 0x2048 },
193 { CODEC_ID_ADPCM_CT, 0x200 }, 193 { CODEC_ID_ADPCM_CT, 0x200 },
194 { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' }, 194 { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },