diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-03-01 10:24:07 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-03-01 10:24:07 +0000 |
| commit | abd6a4fc5394f211b95a003a45a632b2ca8ee4df (patch) | |
| tree | f840e64a28751a2509e78a978bd9480a1a5afe68 | |
| parent | eb3c8c0b311676fdec72f0be5fd5a6feafb051f0 (diff) | |
| download | ffmpeg-abd6a4fc5394f211b95a003a45a632b2ca8ee4df.tar.gz | |
define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump
Originally committed as revision 8166 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ffa9dbc4e8..ebba4257d6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -249,8 +249,11 @@ enum CodecID { stream (only used by libavformat) */ }; +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) /* CODEC_ID_MP3LAME is absolete */ #define CODEC_ID_MP3LAME CODEC_ID_MP3 +#define CODEC_ID_MPEG4AAC CODEC_ID_AAC +#endif enum CodecType { CODEC_TYPE_UNKNOWN = -1, |