From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../libwebrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/libwebrtc/sdk/android/src/java') diff --git a/third_party/libwebrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java b/third_party/libwebrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java index 94dfdf0728..4512d9a049 100644 --- a/third_party/libwebrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java +++ b/third_party/libwebrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java @@ -292,7 +292,7 @@ class HardwareVideoEncoder implements VideoEncoder { updateInputFormat(codec.getInputFormat()); codec.start(); - } catch (IllegalStateException e) { + } catch (IllegalArgumentException | IllegalStateException e) { Logging.e(TAG, "initEncodeInternal failed", e); release(); return VideoCodecStatus.FALLBACK_SOFTWARE; -- cgit v1.2.3