From abd6a4fc5394f211b95a003a45a632b2ca8ee4df Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Thu, 1 Mar 2007 10:24:07 +0000
Subject: 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
---
 libavcodec/avcodec.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libavcodec/avcodec.h')

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,
-- 
cgit v1.2.3