Mercurial > libavcodec.hg

comparison avcodec.h @ 4163:1e8621844040 libavcodec

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 47d1b5261f17
children eced83504436
comparison
equal deleted inserted replaced
4162:4cd1a0848637 4163:1e8621844040
204 CODEC_ID_SOL_DPCM, 204 CODEC_ID_SOL_DPCM,
205 205
206 CODEC_ID_MP2= 0x15000, 206 CODEC_ID_MP2= 0x15000,
207 CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */ 207 CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
208 CODEC_ID_AAC, 208 CODEC_ID_AAC,
209 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
209 CODEC_ID_MPEG4AAC, 210 CODEC_ID_MPEG4AAC,
211 #endif
210 CODEC_ID_AC3, 212 CODEC_ID_AC3,
211 CODEC_ID_DTS, 213 CODEC_ID_DTS,
212 CODEC_ID_VORBIS, 214 CODEC_ID_VORBIS,
213 CODEC_ID_DVAUDIO, 215 CODEC_ID_DVAUDIO,
214 CODEC_ID_WMAV1, 216 CODEC_ID_WMAV1,