diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
index 8128eed88b..36d55e3a49 100644
--- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
+++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
@@ -31,9 +31,11 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.transformer.AndroidTestUtil;
 import com.google.android.exoplayer2.transformer.EncoderUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -86,7 +88,9 @@ public class EncoderCapabilityAnalysisTest {
 
   @Test
   public void logEncoderCapabilities() throws Exception {
-    ImmutableSet<String> supportedVideoMimeTypes = EncoderUtil.getSupportedVideoMimeTypes();
+    ImmutableSet<String> supportedVideoMimeTypes =
+        ImmutableSet.copyOf(
+            Iterables.filter(EncoderUtil.getSupportedMimeTypes(), MimeTypes::isVideo));
 
     // Map from MIME type to a list of maps from capability name to value.
     LinkedHashMap<String, List<Map<String, Object>>> mimeTypeToEncoderInfo = new LinkedHashMap<>();
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
index 0218c199fb..299a1d6be7 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
@@ -64,8 +64,8 @@ public final class EncoderUtil {
     return ImmutableList.copyOf(mimeTypeToEncoders.get(Ascii.toLowerCase(mimeType)));
   }
 
-  /** Returns a list of video {@linkplain MimeTypes MIME types} that can be encoded. */
-  public static synchronized ImmutableSet<String> getSupportedVideoMimeTypes() {
+  /** Returns a list of {@linkplain MimeTypes MIME types} that can be encoded. */
+  public static synchronized ImmutableSet<String> getSupportedMimeTypes() {
     maybePopulateEncoderInfo();
     return ImmutableSet.copyOf(mimeTypeToEncoders.keySet());
   }