[FFmpeg-cvslog] r19661 - trunk/libavcodec/mpeg4audio.h

[alexc]

Author: alexc
Date: Mon Aug 17 02:14:10 2009
New Revision: 19661

Log:
Add USAC and SAOC AOTs to the AudioObjectType enum.

Modified:
   trunk/libavcodec/mpeg4audio.h

Modified: trunk/libavcodec/mpeg4audio.h
==============================================================================
--- trunk/libavcodec/mpeg4audio.h	Sun Aug 16 20:43:36 2009	(r19660)
+++ trunk/libavcodec/mpeg4audio.h	Mon Aug 17 02:14:10 2009	(r19661)
@@ -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