commit ee38fad5e9109f92b24c0e4d6d0d021b3d20e4e0
author Wei Jia <wjia@google.com> Wed Feb 03 23:35:05 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 23:35:05 2016 +0000
tree 7dacf816642e8a6f8708b5cb8d11b95cbbf8aac0
parent eb0482990aaf115ac351cbf8751d7536cb5036d4
parent 608fe1d6b2ea4d88245a109afe2bfba580881a16

Merge "MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow."

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index bfdff38..13b6fce 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1022,7 +1022,7 @@
                     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