# HG changeset patch # User bcoudurier # Date 1172744647 0 # Node ID d9c2365b346ae0ed2721b3d6a68e9a590235639f # Parent 62e88c68166c53625aa64a7d43a0c103a79ff29a define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump diff -r 62e88c68166c -r d9c2365b346a avcodec.h --- a/avcodec.h Wed Feb 28 17:56:45 2007 +0000 +++ b/avcodec.h Thu Mar 01 10:24:07 2007 +0000 @@ -249,8 +249,11 @@ 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,