diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:41:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-11 13:41:54 +0000 |
| commit | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (patch) | |
| tree | 6a7f5163818f67bee2bcbeffc5f9c2f12e9aa49d /drm | |
| parent | 66e05682e4e5d52673b11e7950c0559532f4b6cb (diff) | |
| parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
| download | frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.zip frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.gz frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.bz2 | |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp index f2cadf7..69fa7a0 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp @@ -695,7 +695,7 @@ namespace android { { String8 result; for (size_t i = 0; i < numSubSamples; i++) { - result.appendFormat("[%d] {clear:%d, encrypted:%d} ", i, + result.appendFormat("[%zu] {clear:%zu, encrypted:%zu} ", i, subSamples[i].mNumBytesOfClearData, subSamples[i].mNumBytesOfEncryptedData); } |