From a9daea4377287b353a478d82b53e9cdf23726859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= <sakal@webrtc.org>
Date: Mon, 1 Apr 2019 12:54:18 +0200
Subject: [PATCH] Avoid crashing if decodeTimeMs is null.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:10248
Change-Id: I58a5f37191d65fd1d7b228a0567a0fa8cb745bc8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130512
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27391}
---
 sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
index cc44063e19..7203635813 100644
--- a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
+++ b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
@@ -444,7 +444,7 @@ class AndroidVideoDecoder implements VideoDecoder, VideoSink {
   @Override
   public void onFrame(VideoFrame frame) {
     final VideoFrame newFrame;
-    final int decodeTimeMs;
+    final Integer decodeTimeMs;
     final long timestampNs;
     synchronized (renderedTextureMetadataLock) {
       if (renderedTextureMetadata == null) {