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
This commit is contained in:
Edwin Wong 2012-07-17 14:38:28 -07:00
parent 0bc64be3f5
commit e64a403552

View File

@ -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],