diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-17 14:38:28 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2012-07-17 15:17:02 -0700 |
| commit | e64a4035523aa5e15091a4b6b15612a5bcd1ad01 (patch) | |
| tree | 38e0c067e759420bb366bb08539e13cf73049527 /include/media | |
| parent | 0bc64be3f5198f8dda1ced21bbc957a1d76efbb7 (diff) | |
| download | frameworks_native-e64a4035523aa5e15091a4b6b15612a5bcd1ad01.tar.gz frameworks_native-e64a4035523aa5e15091a4b6b15612a5bcd1ad01.tar.bz2 frameworks_native-e64a4035523aa5e15091a4b6b15612a5bcd1ad01.zip | |
Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36
Change-Id: Ic2a28663d25e3007c95e15ecbb0d44b820045f85
related-to-bug: 6732061
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/hardware/CryptoAPI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/hardware/CryptoAPI.h b/include/media/hardware/CryptoAPI.h index 810a443e8..ee5dec18a 100644 --- a/include/media/hardware/CryptoAPI.h +++ b/include/media/hardware/CryptoAPI.h @@ -70,7 +70,7 @@ struct CryptoPlugin { // At the java level these special errors will then trigger a // MediaCodec.CryptoException that gives clients access to both // the error code and the errorDetailMsg. - virtual status_t decrypt( + virtual ssize_t decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], |