Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c15a72f6 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Android Git Automerger
Browse files

am 1914e7ed: Merge "Fix print format mismatches." 

* commit '1914e7ed':
  Fix print format mismatches.
parents f143b608 1914e7ed

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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());

media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());

        }

    }