summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-14 22:08:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-14 22:08:43 +0000
commit7edda7ac8b86f2493b7df945e9f63da947124288 (patch)
treeb46bdd0a6325134ecc7e206743508786062374fd /include
parent5afbb7468a0cd15ba13a16599a7143fa232a9c16 (diff)
parent829e097f832b4c4c41733f9b77121888204d993e (diff)
downloadframeworks_av-7edda7ac8b86f2493b7df945e9f63da947124288.zip
frameworks_av-7edda7ac8b86f2493b7df945e9f63da947124288.tar.gz
frameworks_av-7edda7ac8b86f2493b7df945e9f63da947124288.tar.bz2
Merge "Fix typos and pointer math."
Diffstat (limited to 'include')
-rw-r--r--include/ndk/NdkMediaCodec.h2
-rw-r--r--include/ndk/NdkMediaCrypto.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h
index 5233fe3..28d121c 100644
--- a/include/ndk/NdkMediaCodec.h
+++ b/include/ndk/NdkMediaCodec.h
@@ -179,7 +179,7 @@ AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new(
size_t *encryptedbytes);
/**
- * delete an AMediaCodecCryptoInfo create previously with AMediaCodecCryptoInfo_new, or
+ * delete an AMediaCodecCryptoInfo created previously with AMediaCodecCryptoInfo_new, or
* obtained from AMediaExtractor
*/
int AMediaCodecCryptoInfo_delete(AMediaCodecCryptoInfo*);
diff --git a/include/ndk/NdkMediaCrypto.h b/include/ndk/NdkMediaCrypto.h
index 0bcba9f..83eaad2 100644
--- a/include/ndk/NdkMediaCrypto.h
+++ b/include/ndk/NdkMediaCrypto.h
@@ -39,7 +39,7 @@ typedef struct AMediaCrypto AMediaCrypto;
typedef uint8_t AMediaUUID[16];
-bool AMediaCrypto_isCryptoSchemeSupport(const AMediaUUID uuid);
+bool AMediaCrypto_isCryptoSchemeSupported(const AMediaUUID uuid);
bool AMediaCrypto_requiresSecureDecoderComponent(const char *mime);