diff options
| author | 2010-12-22 12:38:11 -0800 | |
|---|---|---|
| committer | 2010-12-22 12:38:11 -0800 | |
| commit | 2bf89b2197674ccc414ea60a61199562df9dc52b (patch) | |
| tree | 84f2735e1e78a76b7b9335810f9d35650c65c832 /api/current.xml | |
| parent | 1622eee2e48678b17a4668641957f09213f98905 (diff) | |
| parent | d609ca7f6a48f32dcd6671f877a96e8bf1b898ed (diff) | |
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
Diffstat (limited to 'api/current.xml')
| -rw-r--r-- | api/current.xml | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index e98733567e00..f0aebeb95f7f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -87206,6 +87206,17 @@ deprecated="not deprecated" visibility="public" > +<field name="AAC" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="AMR_NB" type="int" transient="false" @@ -87217,6 +87228,17 @@ visibility="public" > </field> +<field name="AMR_WB" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="DEFAULT" type="int" transient="false" @@ -87373,6 +87395,28 @@ deprecated="not deprecated" visibility="public" > +<field name="AMR_NB" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AMR_WB" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="DEFAULT" type="int" transient="false" @@ -224703,7 +224747,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> |