| commit | fe7ce1c3bc2f028878ab601c04abc54662d28191 | [log] [tgz] |
|---|---|---|
| author | Mirko Bonadei <mbonadei@webrtc.org> | Thu Nov 28 14:12:24 2019 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Nov 28 18:49:20 2019 |
| tree | 49afe7b46f143d243421944d51908c3047fb3ee8 | |
| parent | 0682ca9a838a4dafe246a2522e8462b193cb3d9f [diff] |
Fix ErrorProne MultiVariableDeclaration. This check has been turned on in [1] and it is now preventing the Chromium Roll into WebRTC. [1] - https://chromium-review.googlesource.com/c/chromium/src/+/1939956 TBR: sakal@webrtc.org Bug: None Change-Id: I43372eb3b3987bdf91bc717a6f50be3d8b1db56c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161006 Reviewed-by: Artem Titov <titovartem@webrtc.org> Reviewed-by: Yves Gerey <yvesg@google.com> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29954}
diff --git a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java index e1f2070..5b6e030 100644 --- a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java +++ b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
@@ -463,7 +463,10 @@ private void deliverByteFrame( int result, MediaCodec.BufferInfo info, int rotation, Integer decodeTimeMs) { // Load dimensions from shared memory under the dimension lock. - int width, height, stride, sliceHeight; + int width; + int height; + int stride; + int sliceHeight; synchronized (dimensionLock) { width = this.width; height = this.height;