diff options
| author | Wei Jia <wjia@google.com> | 2016-02-03 14:28:00 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-22 17:14:35 -0700 |
| commit | c4795f0ab03bc1188f2b6ca25b333b8a7220daf3 (patch) | |
| tree | 459ce5c3cae43b0e62ba9ee3cbd9575d6fe67f70 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 4b17bd19e9eceade55dd27aea10b2cefa4e929c7 (diff) | |
| download | frameworks_av-c4795f0ab03bc1188f2b6ca25b333b8a7220daf3.zip frameworks_av-c4795f0ab03bc1188f2b6ca25b333b8a7220daf3.tar.gz frameworks_av-c4795f0ab03bc1188f2b6ca25b333b8a7220daf3.tar.bz2 | |
MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow.
Change-Id: Iad5ae41f0bbfc5e837b4b78e8acaa3f9462329e6
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 2d2e8fb..c056a25 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1032,7 +1032,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { int64_t delay = (media_time * samplerate + 500000) / 1000000; mLastTrack->meta->setInt32(kKeyEncoderDelay, delay); - int64_t paddingus = duration - (segment_duration + media_time); + int64_t paddingus = duration - (int64_t)(segment_duration + media_time); if (paddingus < 0) { // track duration from media header (which is what kKeyDuration is) might // be slightly shorter than the segment duration, which would make the |