From fe7ce1c3bc2f028878ab601c04abc54662d28191 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Thu, 28 Nov 2019 15:12:24 +0100
Subject: [PATCH] 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}
---
 sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
index e1f2070325..5b6e030b91 100644
--- a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
+++ b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
@@ -463,7 +463,10 @@ class AndroidVideoDecoder implements VideoDecoder, VideoSink {
   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;