aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorZdenek Kabelac <kabi@informatics.muni.cz>2003-05-12 10:55:19 +0000
committerZdenek Kabelac <kabi@informatics.muni.cz>2003-05-12 10:55:19 +0000
commit280bd7b7de2e05b695228fbeaa795fc8e4922b6c (patch)
treee58eae91dba7b087a9b86c03b4dee939d2bc54f4 /libavcodec/avcodec.h
parent74c0ac127407847525a7fe38818de0dd772a20b9 (diff)
downloadffmpeg-280bd7b7de2e05b695228fbeaa795fc8e4922b6c.tar.gz
* support for AAC audio streams via libfaad
* could be complied with runtime linking of libfaad (CONFIG_FAADBIN) * missing/untested support for raw AAC streams (maybe there will be just one entry for aac) * missing configure check for libfaad/config option Originally committed as revision 1857 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c7f93ac086..6f0f7dfab3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -53,6 +53,8 @@ enum CodecID {
CODEC_ID_H264,
CODEC_ID_INDEO3,
CODEC_ID_VP3,
+ CODEC_ID_AAC,
+ CODEC_ID_MPEG4AAC,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE,
@@ -1222,6 +1224,8 @@ extern AVCodec cyuv_decoder;
extern AVCodec h264_decoder;
extern AVCodec indeo3_decoder;
extern AVCodec vp3_decoder;
+extern AVCodec aac_decoder;
+extern AVCodec mpeg4aac_decoder;
/* pcm codecs */
#define PCM_CODEC(id, name) \