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

Commit 4cd0d582 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 0938c6f7: Merge "warnings be gone (4/4)" 

* commit '0938c6f7':
  warnings be gone (4/4)
parents 8819b515 0938c6f7

media/libstagefright/matroska/MatroskaExtractor.cpp

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

#include <utils/String8.h>



#include <inttypes.h>



namespace android {



struct DataSourceReader : public mkvparser::IMkvReader {
@@ -409,8 +411,8 @@ void BlockIterator::seek( 
        if (isAudio || block()->IsKey()) {

            // Accept the first key frame

            *actualFrameTimeUs = (block()->GetTime(mCluster) + 500LL) / 1000LL;

            ALOGV("Requested seek point: %lld actual: %lld",

                  seekTimeUs, actualFrameTimeUs);

            ALOGV("Requested seek point: %" PRId64 " actual: %" PRId64,

                  seekTimeUs, *actualFrameTimeUs);

            break;

        }

    }