diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java
index 32d9bf499a..2255ca12db 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java
@@ -117,17 +117,10 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory {
       return false;
     }
     if (localConfiguration.mimeType != null) {
-      ImmutableList<String> supportedMimeTypes =
-          ImmutableList.of(
-              MimeTypes.IMAGE_PNG,
-              MimeTypes.IMAGE_WEBP,
-              MimeTypes.IMAGE_JPEG,
-              MimeTypes.IMAGE_HEIC,
-              MimeTypes.IMAGE_HEIF);
-      return supportedMimeTypes.contains(localConfiguration.mimeType);
+      return MimeTypes.isImage(localConfiguration.mimeType);
     }
     ImmutableList<String> supportedImageTypes =
-        ImmutableList.of(".png", ".webp", ".jpg", ".jpeg", ".heic", ".heif");
+        ImmutableList.of(".png", ".webp", ".jpg", ".jpeg", ".heic", ".heif", ".bmp");
     String uriPath = checkNotNull(localConfiguration.uri.getPath());
     int fileExtensionStart = uriPath.lastIndexOf(".");
     if (fileExtensionStart < 0) {
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java
index 7e5563acb8..805eb42cb2 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java
@@ -46,7 +46,13 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-/** An {@link AssetLoader} implementation that loads images into {@link Bitmap} instances. */
+/**
+ * An {@link AssetLoader} implementation that loads images into {@link Bitmap} instances.
+ *
+ * <p>Supports the image formats listed <a
+ * href="https://developer.android.com/guide/topics/media/media-formats#image-formats">here</a>
+ * except from GIFs, which could exhibit unexpected behavior.
+ */
 @UnstableApi
 public final class ImageAssetLoader implements AssetLoader {