| commit | f17731fb1765314fc38a58c9d19fce9a2553a01e | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Mar 24 04:00:09 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 24 04:00:09 2016 +0000 |
| tree | 8532009d22498252d2c317ed2707b4418ec0db89 | |
| parent | 29f3b2e40de0d1f14d668eeba239e043a8263f18 [diff] | |
| parent | f45c7e7ec65d3fa754c0c538a680313a3647e644 [diff] |
Merge "Add AES-CBC mode to NDK's CryptoInfo" into nyc-dev
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index c6035bd..fcb3a99 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h
@@ -178,7 +178,9 @@ typedef enum { AMEDIACODECRYPTOINFO_MODE_CLEAR = 0, - AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1 + AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1, + AMEDIACODECRYPTOINFO_MODE_AES_WV = 2, + AMEDIACODECRYPTOINFO_MODE_AES_CBC = 3 } cryptoinfo_mode_t; typedef struct {