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

Commit 8819b515 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 2a27a640: Merge "warnings be gone (3/4)" 

* commit '2a27a640':
  warnings be gone (3/4)
parents 355c04df 2a27a640

media/libstagefright/mpeg2ts/ATSParser.cpp

+4 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include <media/IStreamSource.h>

#include <utils/KeyedVector.h>



#include <inttypes.h>



namespace android {



// I want the expression "y" evaluated even if verbose logging is off.
@@ -1267,8 +1269,8 @@ bool ATSParser::PTSTimeDeltaEstablished() { 
}



void ATSParser::updatePCR(

        unsigned PID, uint64_t PCR, size_t byteOffsetFromStart) {

    ALOGV("PCR 0x%016llx @ %d", PCR, byteOffsetFromStart);

        unsigned /* PID */, uint64_t PCR, size_t byteOffsetFromStart) {

    ALOGV("PCR 0x%016" PRIx64 " @ %zu", PCR, byteOffsetFromStart);



    if (mNumPCRs == 2) {

        mPCR[0] = mPCR[1];