From c936aee4123e05844493d5415c9b3d76e98e18e0 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 11 Jul 2016 10:45:24 -0700 Subject: [PATCH] Fix condition for working around broken decoders. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127102633 --- .../java/com/google/android/exoplayer2/MediaCodecUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java index c02302311f..ef20fcb251 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java @@ -213,11 +213,11 @@ public final class MediaCodecUtil { // Work around broken audio decoders. if (Util.SDK_INT < 21 - && ("CIPAACDecoder".equals(name)) + && ("CIPAACDecoder".equals(name) || "CIPMP3Decoder".equals(name) || "CIPVorbisDecoder".equals(name) || "AACDecoder".equals(name) - || "MP3Decoder".equals(name)) { + || "MP3Decoder".equals(name))) { return false; } // Work around https://github.com/google/ExoPlayer/issues/398