diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java
index 6dde8070f4..a317290955 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 
 /** A muxer for producing media container files. */
 @UnstableApi
-public interface Muxer {
+public interface Muxer extends AutoCloseable {
   /** Factory for muxers. */
   interface Factory {
     /**
@@ -76,5 +76,6 @@ public interface Muxer {
    *
    * @throws MuxerException If the muxer fails to finish writing the output.
    */
+  @Override
   void close() throws MuxerException;
 }