diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dfd8f73fdf..24cbd866b9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -35,6 +35,9 @@
 *   Extractors:
     *   Allow `Mp4Extractor` and `FragmentedMp4Extractor` to identify H264
         samples that are not used as reference by subsequent samples.
+    *   MP3: Fix `Searched too many bytes` error by correctly ignoring trailing
+        non-MP3 data based on the length field in an `Info` frame
+        ([#1480](https://github.com/androidx/media/issues/1480)).
 *   DataSource:
     *   Update `HttpEngineDataSource` to allow use starting at version S
         extension 7 instead of API level 34
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/ConstantBitrateSeeker.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/ConstantBitrateSeeker.java
index e167d4bbe8..12f5761d99 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/ConstantBitrateSeeker.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/ConstantBitrateSeeker.java
@@ -25,6 +25,7 @@ import androidx.media3.extractor.MpegAudioUtil;
 /* package */ final class ConstantBitrateSeeker extends ConstantBitrateSeekMap implements Seeker {
 
   private final int bitrate;
+  private final long dataEndPosition;
 
   /**
    * Constructs an instance.
@@ -60,6 +61,7 @@ import androidx.media3.extractor.MpegAudioUtil;
       boolean allowSeeksIfLengthUnknown) {
     super(inputLength, firstFramePosition, bitrate, frameSize, allowSeeksIfLengthUnknown);
     this.bitrate = bitrate;
+    dataEndPosition = inputLength != C.LENGTH_UNSET ? inputLength : C.INDEX_UNSET;
   }
 
   @Override
@@ -69,7 +71,7 @@ import androidx.media3.extractor.MpegAudioUtil;
 
   @Override
   public long getDataEndPosition() {
-    return C.INDEX_UNSET;
+    return dataEndPosition;
   }
 
   @Override
diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java
index 8900629912..d18d7e678d 100644
--- a/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java
+++ b/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java
@@ -54,6 +54,21 @@ public final class Mp3ExtractorTest {
         Mp3Extractor::new, "media/mp3/test-cbr-info-header-pcut-frame.mp3", simulationConfig);
   }
 
+  // https://github.com/androidx/media/issues/1480
+  @Test
+  public void mp3SampleWithInfoHeaderAndTrailingGarbage() throws Exception {
+    // This test file is test-cbr-info-header.mp3 with 150kB of 0xDEADBEEF garbage appended on the
+    // end. The test asserts that the extracted samples are the same as for
+    // test-cbr-info-header.mp3.
+    ExtractorAsserts.assertBehavior(
+        Mp3Extractor::new,
+        "media/mp3/test-cbr-info-header-trailing-garbage.mp3",
+        new AssertionConfig.Builder()
+            .setDumpFilesPrefix("extractordumps/mp3/test-cbr-info-header.mp3")
+            .build(),
+        simulationConfig);
+  }
+
   @Test
   public void mp3SampleWithCbrSeeker() throws Exception {
     ExtractorAsserts.assertBehavior(
diff --git a/libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header-trailing-garbage.mp3 b/libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header-trailing-garbage.mp3
new file mode 100644
index 0000000000..cb2cf6528d
Binary files /dev/null and b/libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header-trailing-garbage.mp3 differ