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

Commit 06787df4 authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge "Fix integer overflow abort" into rvc-dev am: 7f6c727f am: aee4cab2 

Change-Id: I9d3affac6f5267bc32a3124b635b66884534e827
parents 4d18ed11 aee4cab2

media/extractors/mp4/MPEG4Extractor.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -5967,7 +5967,11 @@ media_status_t MPEG4Source::read( 
                    sampleTime += mElstInitialEmptyEditTicks;

                    sampleTime += mElstInitialEmptyEditTicks;

                }

                }

                if (mElstShiftStartTicks > 0){

                if (mElstShiftStartTicks > 0){

                    if (sampleTime > mElstShiftStartTicks) {

                        sampleTime -= mElstShiftStartTicks;

                        sampleTime -= mElstShiftStartTicks;

                    } else {

                        sampleTime = 0;

                    }

                }

                }

                targetSampleTimeUs = (sampleTime * 1000000ll) / mTimescale;

                targetSampleTimeUs = (sampleTime * 1000000ll) / mTimescale;

            }

            }