commit b586c8e6a3415a4f0426239510300bbbaefad166
author Zhijun He <zhijunhe@google.com> Thu Feb 04 04:46:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 04:46:31 2016 +0000
tree 89166ce642eca9096c0d18e496333607f11500fb
parent 4be8c6d6337c1aa9d80430c3de4fc7251cd52af9
parent edd41ae47b99b98249e819ac72fb94264326a4eb

Merge "Camera3: buffer manager doesn't support HAL3.2 devices"

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index ab21322..6f4a65b 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1037,7 +1037,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