commit 90fe9d0dbdfc9c161731088e5c7aea5dd66a5237
author Siva Velusamy <vsiva@google.com> Thu Apr 26 13:37:43 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 13:37:43 2012 -0700
tree 3febd5cdb568d1183259b7ffb4132bc530b5a1eb
parent 8e846fd6b3e09f5a52f47311e97b8d8f683833d4
parent c7d767ad57a25eeefbbfe2610396d800f04178ed

Merge "gldebugger: Allow connections from root user" into jb-dev

include/media/openmax/OMX_Audio.h

diff --git a/include/media/openmax/OMX_Audio.h b/include/media/openmax/OMX_Audio.h
index 3482841..a15e702 100644
--- a/include/media/openmax/OMX_Audio.h
+++ b/include/media/openmax/OMX_Audio.h
@@ -261,7 +261,8 @@
   OMX_AUDIO_AACObjectERLC = 17,     /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */
   OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */
   OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */
-  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 
+  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/
+  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
   OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
   OMX_AUDIO_AACObjectMax = 0x7FFFFFFF
 } OMX_AUDIO_AACPROFILETYPE;
@@ -1325,4 +1326,3 @@
 
 #endif
 /* File EOF */
-