diff options
| author | Andreas Huber <andih@google.com> | 2012-11-30 14:28:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 14:28:14 -0800 |
| commit | 1adc5975fa293afc484cc3095f74a7b4964f6306 (patch) | |
| tree | 1b68b188fb9d04bd109f560cb1829bcab00240a4 /api | |
| parent | cc95712ea2eb07913d8a9964cd8266245f8c1fd6 (diff) | |
| parent | 800c8ab68d695f1b6c5332c80a32316cdca69954 (diff) | |
| download | frameworks_base-1adc5975fa293afc484cc3095f74a7b4964f6306.zip frameworks_base-1adc5975fa293afc484cc3095f74a7b4964f6306.tar.gz frameworks_base-1adc5975fa293afc484cc3095f74a7b4964f6306.tar.bz2 | |
am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40f
* commit '800c8ab68d695f1b6c5332c80a32316cdca69954':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ec3aa89..454e5da 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11203,7 +11203,9 @@ package android.media { method public final int dequeueInputBuffer(long); method public final int dequeueOutputBuffer(android.media.MediaCodec.BufferInfo, long); method public final void flush(); + method public android.media.MediaCodecInfo getCodecInfo(); method public java.nio.ByteBuffer[] getInputBuffers(); + method public final java.lang.String getName(); method public java.nio.ByteBuffer[] getOutputBuffers(); method public final android.media.MediaFormat getOutputFormat(); method public final void queueInputBuffer(int, int, int, long, int) throws android.media.MediaCodec.CryptoException; |