Mercurial > libavcodec.hg
comparison avcodec.h @ 4609:d9c2365b346a libavcodec
define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump
| author | bcoudurier |
|---|---|
| date | Thu, 01 Mar 2007 10:24:07 +0000 |
| parents | 62e88c68166c |
| children | c81aa982b72b |
comparison
equal
deleted
inserted
replaced
| 4608:62e88c68166c | 4609:d9c2365b346a |
|---|---|
| 247 | 247 |
| 248 CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport | 248 CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport |
| 249 stream (only used by libavformat) */ | 249 stream (only used by libavformat) */ |
| 250 }; | 250 }; |
| 251 | 251 |
| 252 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) | |
| 252 /* CODEC_ID_MP3LAME is absolete */ | 253 /* CODEC_ID_MP3LAME is absolete */ |
| 253 #define CODEC_ID_MP3LAME CODEC_ID_MP3 | 254 #define CODEC_ID_MP3LAME CODEC_ID_MP3 |
| 255 #define CODEC_ID_MPEG4AAC CODEC_ID_AAC | |
| 256 #endif | |
| 254 | 257 |
| 255 enum CodecType { | 258 enum CodecType { |
| 256 CODEC_TYPE_UNKNOWN = -1, | 259 CODEC_TYPE_UNKNOWN = -1, |
| 257 CODEC_TYPE_VIDEO, | 260 CODEC_TYPE_VIDEO, |
| 258 CODEC_TYPE_AUDIO, | 261 CODEC_TYPE_AUDIO, |