diff options
author | Chih-Hung Hsieh <chh@google.com> | 2014-12-10 17:20:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-10 17:20:53 +0000 |
commit | 1914e7edb45114e9953982f21c50e754af5d1fe1 (patch) | |
tree | 1d0da9bcb64b41dbc67370db1b843df04eea8ec8 | |
parent | d1aeff5597785336af3bba34cfddb0ebbc6b2397 (diff) | |
parent | cd8d9c6cfe5ca53f17be1ea8edac6b324e203f52 (diff) | |
download | frameworks_av-1914e7edb45114e9953982f21c50e754af5d1fe1.zip frameworks_av-1914e7edb45114e9953982f21c50e754af5d1fe1.tar.gz frameworks_av-1914e7edb45114e9953982f21c50e754af5d1fe1.tar.bz2 |
Merge "Fix print format mismatches."
-rw-r--r-- | media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp index a3274ea..1f76068 100644 --- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp @@ -217,7 +217,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) { // Apparently an extension is always considered an even // multiple of 8 bits long. - ALOGI("Skipping %d bits after sync extension", + ALOGI("Skipping %zu bits after sync extension", 8 - (numBitsInExtension & 7)); bits->skipBits(8 - (numBitsInExtension & 7)); @@ -422,7 +422,7 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { } if (offset < buffer->size()) { - ALOGI("ignoring %d bytes of trailing data", buffer->size() - offset); + ALOGI("ignoring %zu bytes of trailing data", buffer->size() - offset); } CHECK_LE(offset, buffer->size()); diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp index 7eb6542..156004c 100644 --- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp @@ -360,7 +360,7 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket( } if (offset != buffer->size()) { - ALOGW("potentially malformed packet (offset %d, size %d)", + ALOGW("potentially malformed packet (offset %zu, size %zu)", offset, buffer->size()); } } |