From 4d131e4eec9cbcf2d40a7438e6b18aee68e90c5c Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 9 Jul 2018 21:41:33 +0200 Subject: [PATCH] Switch from int64 to int64_t. The usage of int64 seems unintentional but it works because int64 is defined here: https://cs.chromium.org/chromium/src/third_party/libyuv/include/libyuv/basic_types.h?l=33&rcl=e1f6c1c0b57a9210bb95e88080fa171296210296 This CL switches to int64_t and aligns with the rest of the codebase. Bug: None Change-Id: I2292974dbca3692b570214d8bc790336219b151e Reviewed-on: https://webrtc-review.googlesource.com/87700 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#23894} --- sdk/android/src/jni/androidmediadecoder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/android/src/jni/androidmediadecoder.cc b/sdk/android/src/jni/androidmediadecoder.cc index 1ca9e06177..96fc748bb9 100644 --- a/sdk/android/src/jni/androidmediadecoder.cc +++ b/sdk/android/src/jni/androidmediadecoder.cc @@ -442,7 +442,7 @@ int32_t MediaCodecVideoDecoder::DecodeOnCodecThread( << frames_received_ << ". Decoded: " << frames_decoded_; EnableFrameLogOnWarning(); } - const int64 drain_start = rtc::TimeMillis(); + const int64_t drain_start = rtc::TimeMillis(); while ((frames_received_ > frames_decoded_ + max_pending_frames_) && (rtc::TimeMillis() - drain_start) < kMediaCodecTimeoutMs) { if (!DeliverPendingOutputs(jni, kMediaCodecPollMs)) {