diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 20:22:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 20:22:15 +0000 |
| commit | e78a747d35762c5468c7af4cd80ca60f1b0e0d2e (patch) | |
| tree | c51b959f7b4e37c8507de0ea54afce35cb52128d /media/jni/android_media_MediaExtractor.cpp | |
| parent | 6ae7cd063b244ed53ad7dfa5515d59a8af859361 (diff) | |
| parent | f7a6fe95b0b439d3c6288b0b9da152b4c70c2265 (diff) | |
| download | frameworks_base-e78a747d35762c5468c7af4cd80ca60f1b0e0d2e.zip frameworks_base-e78a747d35762c5468c7af4cd80ca60f1b0e0d2e.tar.gz frameworks_base-e78a747d35762c5468c7af4cd80ca60f1b0e0d2e.tar.bz2 | |
am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
Don't assume that size_t is 32-bit
Diffstat (limited to 'media/jni/android_media_MediaExtractor.cpp')
| -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 d3a8b22..a78f16d 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -561,7 +561,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; @@ -571,7 +571,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; @@ -588,7 +588,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; |