Snap for 8770325 from 6cf3be6acb0e321459172ec12824f448e1c14b9e to tm-qpr1-release

Change-Id: I53bf2b3e1ad607cd7ac7d9489a7252d3c5ffddcc
diff --git a/components/V4L2EncodeComponent.cpp b/components/V4L2EncodeComponent.cpp
index 4ce4404..c2a2679 100644
--- a/components/V4L2EncodeComponent.cpp
+++ b/components/V4L2EncodeComponent.cpp
@@ -757,7 +757,8 @@
     constexpr int64_t kMaxFramerateDiff = 5;
     if (mLastFrameTime && (timestamp > *mLastFrameTime)) {
         int64_t newFramerate = std::max(
-                static_cast<int64_t>(std::round(1000000.0 / (timestamp - *mLastFrameTime))), 1LL);
+                static_cast<int64_t>(std::round(1000000.0 / (timestamp - *mLastFrameTime))),
+                static_cast<int64_t>(1LL));
         if (abs(mFramerate - newFramerate) > kMaxFramerateDiff) {
             ALOGV("Adjusting framerate to %" PRId64 " based on frame timestamps", newFramerate);
             mInterface->setFramerate(static_cast<uint32_t>(newFramerate));