summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-11-11 20:52:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-11 20:52:05 -0800
commitd725d23ae67045c22003d419d5c31ca1d551da89 (patch)
tree90f924edca9558e33c6576b49af0ca5f4ae9b116 /include
parent41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51 (diff)
parentdb50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7 (diff)
downloadframeworks_av-d725d23ae67045c22003d419d5c31ca1d551da89.zip
frameworks_av-d725d23ae67045c22003d419d5c31ca1d551da89.tar.gz
frameworks_av-d725d23ae67045c22003d419d5c31ca1d551da89.tar.bz2
am db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev
* commit 'db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7': configure bitrate and bitrate mode at encoder initialization for VP8/9
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 15c99a5..2fcfc62 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -266,6 +266,7 @@ private:
status_t setupMPEG4EncoderParameters(const sp<AMessage> &msg);
status_t setupH263EncoderParameters(const sp<AMessage> &msg);
status_t setupAVCEncoderParameters(const sp<AMessage> &msg);
+ status_t setupVPXEncoderParameters(const sp<AMessage> &msg);
status_t verifySupportForProfileAndLevel(int32_t profile, int32_t level);