commit ad4663c5a57b274defaed6e156d323083e4638a0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 17 19:02:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 17 19:02:14 2016 +0000
tree 2d981ee49da81ddfb02682d8b215da22161c06bd
parent 6cc43e10f46a2b388ff65ed5c1e19eb5bc8603f8
parent b26e7a07894882f8cef2c6b0127106e649f22d42

Merge "Camera3: Add missing mTriggerMutex lock"

media/libstagefright/httplive/LiveSession.cpp

diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index e24d08d..8e8fa52 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -178,7 +178,7 @@
         *shortTermBps = mShortTermEstimate;
     }
 
-    int32_t minEstimate = -1, maxEstimate = -1;
+    int64_t minEstimate = -1, maxEstimate = -1;
     List<int32_t>::iterator it;
     for (it = mPrevEstimates.begin(); it != mPrevEstimates.end(); it++) {
         int32_t estimate = *it;