| commit | 3a436c1c3c5d1b669732e6f5eaaa6986118ab306 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Mar 03 19:45:48 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 03 19:45:49 2014 +0000 |
| tree | 94f19c76de6ecf4632d48144b9d302afc36e2246 | |
| parent | a4c673e9af8148eed70a5fab54eaefb8506a3ab3 [diff] | |
| parent | 76edb1c0e644fe9f0b9f93939647a34123a60063 [diff] |
Merge "Adding opus to list of audio formats"
diff --git a/include/system/audio.h b/include/system/audio.h index afd7176..294139d 100644 --- a/include/system/audio.h +++ b/include/system/audio.h
@@ -169,6 +169,7 @@ AUDIO_FORMAT_HE_AAC_V1 = 0x05000000UL, AUDIO_FORMAT_HE_AAC_V2 = 0x06000000UL, AUDIO_FORMAT_VORBIS = 0x07000000UL, + AUDIO_FORMAT_OPUS = 0x08000000UL, AUDIO_FORMAT_MAIN_MASK = 0xFF000000UL, AUDIO_FORMAT_SUB_MASK = 0x00FFFFFFUL,