summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/id3
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-11 13:41:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-11 13:41:54 +0000
commit566be7c33fc56ae4c34168ecbee5316374f7e3c5 (patch)
tree6a7f5163818f67bee2bcbeffc5f9c2f12e9aa49d /media/libstagefright/id3
parent66e05682e4e5d52673b11e7950c0559532f4b6cb (diff)
parent3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff)
downloadframeworks_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 'media/libstagefright/id3')
-rw-r--r--media/libstagefright/id3/testid3.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/id3/testid3.cpp b/media/libstagefright/id3/testid3.cpp
index bc4572c..b2f4188 100644
--- a/media/libstagefright/id3/testid3.cpp
+++ b/media/libstagefright/id3/testid3.cpp
@@ -33,7 +33,7 @@ static void hexdump(const void *_data, size_t size) {
const uint8_t *data = (const uint8_t *)_data;
size_t offset = 0;
while (offset < size) {
- printf("0x%04x ", offset);
+ printf("0x%04zx ", offset);
size_t n = size - offset;
if (n > 16) {
@@ -101,7 +101,7 @@ void scanFile(const char *path) {
const void *data = tag.getAlbumArt(&dataSize, &mime);
if (data) {
- printf("found album art: size=%d mime='%s'\n", dataSize,
+ printf("found album art: size=%zu mime='%s'\n", dataSize,
mime.string());
hexdump(data, dataSize > 128 ? 128 : dataSize);