aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2010-11-02 08:32:04 +0000
committerJanne Grunau <janne-ffmpeg@jannau.net>2010-11-02 08:32:04 +0000
commit136e19e1cf4fb1bc7b35e21357dd75c759b8b35e (patch)
tree886c9fb41e9204bd6fbb74e689778211bb94a5c3 /libavcodec/avcodec.h
parent6c003e6de835395a07d47ac11b648f6bbf75d419 (diff)
downloadffmpeg-136e19e1cf4fb1bc7b35e21357dd75c759b8b35e.tar.gz
Add single stream LATM/LOAS decoder
The decoder is just a wrapper around the AAC decoder. based on patch by Paul Kendall { paul <ät> kcbbs gen nz } Originally committed as revision 25642 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 705259ed2a..96d7987bdd 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -31,7 +31,7 @@
#include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 93
+#define LIBAVCODEC_VERSION_MINOR 94
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -376,6 +376,7 @@ enum CodecID {
CODEC_ID_ATRAC1,
CODEC_ID_BINKAUDIO_RDFT,
CODEC_ID_BINKAUDIO_DCT,
+ CODEC_ID_AAC_LATM,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,