From e64a4035523aa5e15091a4b6b15612a5bcd1ad01 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Tue, 17 Jul 2012 14:38:28 -0700 Subject: [PATCH] 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 --- include/media/hardware/CryptoAPI.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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],