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

Commit 4018c06e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix integer overflow in MPEG4Extractor" am: 80fe08ba am: e5375793 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2330395



Change-Id: I829c17e887730cb7808c76c1035c2a9dc0db5463
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df36b0bb e5375793

media/module/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6723,7 +6723,7 @@ media_status_t MPEG4Source::fragmentedRead( 
        const Sample *smpl = &mCurrentSamples[mCurrentSampleIndex];

        offset = smpl->offset;

        size = smpl->size;

        cts = mCurrentTime + smpl->compositionOffset;

        cts = (int64_t)mCurrentTime + (int64_t)smpl->compositionOffset;



        if (mElstInitialEmptyEditTicks > 0) {

            cts += mElstInitialEmptyEditTicks;