diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-13 15:11:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-13 15:11:07 -0700 |
| commit | 65e8d62a5b243518795cdafa498df4a49baf6940 (patch) | |
| tree | 14733866f571e94c11a4d7a6ec3dade62d144e29 /include/media/ICrypto.h | |
| parent | 109347d421413303eb1678dd9e2aa9d40acf89d2 (diff) | |
| parent | fa2b8f243eb048fb2b8e5a14356190f69eb31a36 (diff) | |
Merge "Fixed sample video corrupted in MediaCodec mode." into jb-devandroid-cts-4.1_r2jb-dev
Diffstat (limited to 'include/media/ICrypto.h')
| -rw-r--r-- | include/media/ICrypto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/ICrypto.h b/include/media/ICrypto.h index 32a2cf77..61059bde 100644 --- a/include/media/ICrypto.h +++ b/include/media/ICrypto.h @@ -41,7 +41,7 @@ struct ICrypto : public IInterface { virtual bool requiresSecureDecoderComponent( const char *mime) const = 0; - virtual status_t decrypt( + virtual ssize_t decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], |