summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-05-09 22:26:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-09 22:26:00 +0000
commitcd306b4ca74e3907b19ff3925dc19fbd22dbcccc (patch)
treebfc5af6146b33c500ec6a6c718df559e37557b5c /api
parent556540254768a12d0c2b83841c570574fb74f90d (diff)
parent0f94e3f5ede4ab16c0ef4a4b36f03e9a98fa05ac (diff)
downloadframeworks_base-cd306b4ca74e3907b19ff3925dc19fbd22dbcccc.zip
frameworks_base-cd306b4ca74e3907b19ff3925dc19fbd22dbcccc.tar.gz
frameworks_base-cd306b4ca74e3907b19ff3925dc19fbd22dbcccc.tar.bz2
am 53e4004b: Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp"
* commit '53e4004becc176288ed3cecdf2d9e22ec4cbf51e': Added MediaCodec.releaseOutputBuffer() method with render timestamp
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5e1e400..37a17d7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13834,6 +13834,7 @@ package android.media {
method public final void queueSecureInputBuffer(int, int, android.media.MediaCodec.CryptoInfo, long, int) throws android.media.MediaCodec.CryptoException;
method public final void release();
method public final void releaseOutputBuffer(int, boolean);
+ method public final void releaseOutputBuffer(int, long);
method public void setNotificationCallback(android.media.MediaCodec.NotificationCallback);
method public final void setParameters(android.os.Bundle);
method public final void setVideoScalingMode(int);