diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-13 17:54:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-13 17:54:32 -0700 |
| commit | 2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead (patch) | |
| tree | 58b79b403e5ec36812aa8ef233cb404b2fcd7341 /include/media | |
| parent | 1ea6d23396118a9cfe912b7b8a4e6f231e318ea2 (diff) | |
| parent | 190313ec68e81c10d200ff3c20ac152cf90760d6 (diff) | |
| download | frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.zip frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.tar.gz frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.tar.bz2 | |
am 190313ec: am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '190313ec68e81c10d200ff3c20ac152cf90760d6':
Fixed sample video corrupted in MediaCodec mode.
Diffstat (limited to 'include/media')
| -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 32a2cf7..61059bd 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], |