diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:42:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:42:36 +0000 |
| commit | 762dda6d9e3aac02709a4c00f2bdf80f5de6f99a (patch) | |
| tree | efbc0940c3dd689bebff161624c7e7c0ece887ec /media/jni | |
| parent | 143528fc918d3865a6b14c98fff40cc861c29c82 (diff) | |
| parent | 51ec4ec51f88d854b182547405e37f3ae74c35bd (diff) | |
| download | frameworks_base-762dda6d9e3aac02709a4c00f2bdf80f5de6f99a.zip frameworks_base-762dda6d9e3aac02709a4c00f2bdf80f5de6f99a.tar.gz frameworks_base-762dda6d9e3aac02709a4c00f2bdf80f5de6f99a.tar.bz2 | |
am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
Don't assume that size_t is 32-bit
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 705de88..543cb6c 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -556,7 +556,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo( return JNI_FALSE; } - size_t numSubSamples = size / sizeof(size_t); + size_t numSubSamples = size / sizeof(int32_t); if (numSubSamples == 0) { return JNI_FALSE; @@ -566,7 +566,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo( jboolean isCopy; jint *dst = env->GetIntArrayElements(numBytesOfEncryptedDataObj, &isCopy); for (size_t i = 0; i < numSubSamples; ++i) { - dst[i] = ((const size_t *)data)[i]; + dst[i] = ((const int32_t *)data)[i]; } env->ReleaseIntArrayElements(numBytesOfEncryptedDataObj, dst, 0); dst = NULL; @@ -583,7 +583,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo( jboolean isCopy; jint *dst = env->GetIntArrayElements(numBytesOfPlainDataObj, &isCopy); for (size_t i = 0; i < numSubSamples; ++i) { - dst[i] = ((const size_t *)data)[i]; + dst[i] = ((const int32_t *)data)[i]; } env->ReleaseIntArrayElements(numBytesOfPlainDataObj, dst, 0); dst = NULL; |