diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
| commit | cbee7a69448467ca615a53fd3927b53b1547509d (patch) | |
| tree | fb82a9365866806832a994ff7932c8d9e06c8d2f /libavcodec | |
| parent | 6c4d16556b96dae18977fddad3a43faaed579993 (diff) | |
| download | ffmpeg-cbee7a69448467ca615a53fd3927b53b1547509d.tar.gz | |
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/faad.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 633032234f..ac128eca40 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -206,7 +206,9 @@ enum CodecID { CODEC_ID_MP2= 0x15000, CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */ CODEC_ID_AAC, +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) CODEC_ID_MPEG4AAC, +#endif CODEC_ID_AC3, CODEC_ID_DTS, CODEC_ID_VORBIS, diff --git a/libavcodec/faad.c b/libavcodec/faad.c index fcea1c815f..df33ea0b27 100644 --- a/libavcodec/faad.c +++ b/libavcodec/faad.c @@ -326,7 +326,9 @@ AVCodec name ## _decoder = { \ // FIXME - raw AAC files - maybe just one entry will be enough AAC_CODEC(CODEC_ID_AAC, aac); +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) // If it's mp4 file - usually embeded into Qt Mov AAC_CODEC(CODEC_ID_MPEG4AAC, mpeg4aac); +#endif #undef AAC_CODEC |