aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2009-08-17 00:14:10 +0000
committerAlex Converse <alex.converse@gmail.com>2009-08-17 00:14:10 +0000
commit08dac48d613b58295f4fb646ef150b01d4884be2 (patch)
treec9c1112f10af841f513adb355b2a089eda145263
parentc255994b294097c05f1debd376064f132392b88c (diff)
downloadffmpeg-08dac48d613b58295f4fb646ef150b01d4884be2.tar.gz
Add USAC and SAOC AOTs to the AudioObjectType enum.
Originally committed as revision 19661 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpeg4audio.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index fd78bdbee9..97c5c5a4f7 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -90,6 +90,9 @@ enum AudioObjectType {
AOT_ER_AAC_ELD, ///< N Error Resilient Enhanced Low Delay
AOT_SMR_SIMPLE, ///< N Symbolic Music Representation Simple
AOT_SMR_MAIN, ///< N Symbolic Music Representation Main
+ AOT_USAC_NOSBR, ///< N Unified Speech and Audio Coding (no SBR)
+ AOT_SAOC, ///< N Spatial Audio Object Coding
+ AOT_USAC = 45, ///< N Unified Speech and Audio Coding
};
#define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE