From: Alex Converse <alex.converse@gmail.com>
Date: Mon, 17 Aug 2009 00:14:10 +0000 (+0000)
Subject: Add USAC and SAOC AOTs to the AudioObjectType enum.
X-Git-Tag: v0.6~3551
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08dac48d613b58295f4fb646ef150b01d4884be2;p=platform%2Fupstream%2Flibav.git

Add USAC and SAOC AOTs to the AudioObjectType enum.

Originally committed as revision 19661 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index fd78bdb..97c5c5a 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