diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 893601a859..58604edccc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -318,7 +318,14 @@ public final class MediaCodecUtil {
     }
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if ("OMX.SEC.mp3.dec".equals(name) && "SM-T530".equals(Util.MODEL)) {
+    if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name))
+        && ("GT-I9515".equals(Util.MODEL)
+        || "GT-I9152".equals(Util.MODEL)
+        || "GT-P5220".equals(Util.MODEL)
+        || "SM-G350".equals(Util.MODEL)
+        || "SM-S7580".equals(Util.MODEL)
+        || "SM-T231".equals(Util.MODEL)
+        || "SM-T530".equals(Util.MODEL))) {
       return false;
     }