diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntry.java b/libraries/container/src/main/java/androidx/media3/container/MdtaMetadataEntry.java
similarity index 98%
rename from libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntry.java
rename to libraries/container/src/main/java/androidx/media3/container/MdtaMetadataEntry.java
index ca8dd41aca..694a73ae78 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntry.java
+++ b/libraries/container/src/main/java/androidx/media3/container/MdtaMetadataEntry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.extractor.metadata.mp4;
+package androidx.media3.container;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntryTest.java b/libraries/container/src/test/java/androidx/media3/container/MdtaMetadataEntryTest.java
similarity index 96%
rename from libraries/extractor/src/test/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntryTest.java
rename to libraries/container/src/test/java/androidx/media3/container/MdtaMetadataEntryTest.java
index b5ecbf3e71..1243df3e49 100644
--- a/libraries/extractor/src/test/java/androidx/media3/extractor/metadata/mp4/MdtaMetadataEntryTest.java
+++ b/libraries/container/src/test/java/androidx/media3/container/MdtaMetadataEntryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.extractor.metadata.mp4;
+package androidx.media3.container;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MetadataRetrieverTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MetadataRetrieverTest.java
index b9b5756503..9749d7e55e 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MetadataRetrieverTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MetadataRetrieverTest.java
@@ -16,8 +16,8 @@
 
 package androidx.media3.exoplayer;
 
+import static androidx.media3.container.MdtaMetadataEntry.KEY_ANDROID_CAPTURE_FPS;
 import static androidx.media3.exoplayer.MetadataRetriever.retrieveMetadata;
-import static androidx.media3.extractor.metadata.mp4.MdtaMetadataEntry.KEY_ANDROID_CAPTURE_FPS;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
@@ -26,8 +26,8 @@ import android.net.Uri;
 import androidx.media3.common.C;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
+import androidx.media3.container.MdtaMetadataEntry;
 import androidx.media3.exoplayer.source.TrackGroupArray;
-import androidx.media3.extractor.metadata.mp4.MdtaMetadataEntry;
 import androidx.media3.extractor.metadata.mp4.MotionPhotoMetadata;
 import androidx.media3.extractor.metadata.mp4.SlowMotionData;
 import androidx.media3.extractor.metadata.mp4.SmtaMetadataEntry;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MetadataUtil.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MetadataUtil.java
index 023d573e29..be8c295220 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MetadataUtil.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MetadataUtil.java
@@ -24,13 +24,13 @@ import androidx.media3.common.Format;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.ParsableByteArray;
+import androidx.media3.container.MdtaMetadataEntry;
 import androidx.media3.extractor.GaplessInfoHolder;
 import androidx.media3.extractor.metadata.id3.ApicFrame;
 import androidx.media3.extractor.metadata.id3.CommentFrame;
 import androidx.media3.extractor.metadata.id3.Id3Frame;
 import androidx.media3.extractor.metadata.id3.InternalFrame;
 import androidx.media3.extractor.metadata.id3.TextInformationFrame;
-import androidx.media3.extractor.metadata.mp4.MdtaMetadataEntry;
 import com.google.common.collect.ImmutableList;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
diff --git a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
index f5f1bfb8ec..4e22bf88c9 100644
--- a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
+++ b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
@@ -25,6 +25,7 @@ import androidx.media3.common.text.Cue;
 import androidx.media3.common.text.CueGroup;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.MdtaMetadataEntry;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.extractor.metadata.dvbsi.AppInfoTable;
 import androidx.media3.extractor.metadata.emsg.EventMessage;
@@ -32,7 +33,6 @@ import androidx.media3.extractor.metadata.flac.PictureFrame;
 import androidx.media3.extractor.metadata.icy.IcyHeaders;
 import androidx.media3.extractor.metadata.icy.IcyInfo;
 import androidx.media3.extractor.metadata.id3.Id3Frame;
-import androidx.media3.extractor.metadata.mp4.MdtaMetadataEntry;
 import androidx.media3.extractor.metadata.mp4.MotionPhotoMetadata;
 import androidx.media3.extractor.metadata.mp4.SlowMotionData;
 import androidx.media3.extractor.metadata.mp4.SmtaMetadataEntry;