diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AvcChunkHandler.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AvcChunkHandler.java
index 0d67032d53..e1f8dc3cef 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AvcChunkHandler.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AvcChunkHandler.java
@@ -92,7 +92,6 @@ public class AvcChunkHandler extends NalChunkHandler {
     //We skip IDR in the switch
     if (spsData.picOrderCountType == 0) {
       int picOrderCountLsb = in.readBits(spsData.picOrderCntLsbLength);
-      //Log.d("Test", "FrameNum: " + frame + " cnt=" + picOrderCountLsb);
       picCountClock.setPicCount(picOrderCountLsb);
       return;
     } else if (spsData.picOrderCountType == 2) {
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviSeekMap.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviSeekMap.java
index 5efd155396..4e16c805b7 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviSeekMap.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviSeekMap.java
@@ -95,8 +95,6 @@ public class AviSeekMap implements SeekMap {
     } else {
       return new SeekPoints(getSeekPoint(firstSeekIndex));
     }
-
-    //Log.d(AviExtractor.TAG, "SeekPoint: us=" + outUs + " pos=" + position);
   }
 
   /**
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/ChunkHandler.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/ChunkHandler.java
index c18c76e496..b303e25e77 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/ChunkHandler.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/ChunkHandler.java
@@ -173,7 +173,6 @@ public class ChunkHandler {
       trackOutput.sampleMetadata(
           clock.getUs(), (isKeyFrame() ? C.BUFFER_FLAG_KEY_FRAME : 0), size, 0, null);
     }
-    //Log.d(AviExtractor.TAG, "Frame: " + (isVideo()? 'V' : 'A') + " us=" + clock.getUs() + " size=" + size + " frame=" + clock.getIndex() + " key=" + isKeyFrame());
     clock.advance();
   }
 
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/MpegAudioChunkHandler.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/MpegAudioChunkHandler.java
index fed06bd755..3734f097b5 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/MpegAudioChunkHandler.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/MpegAudioChunkHandler.java
@@ -132,7 +132,6 @@ public class MpegAudioChunkHandler extends ChunkHandler {
     frameRemaining -= bytes;
     if (frameRemaining == 0) {
       trackOutput.sampleMetadata(timeUs, C.BUFFER_FLAG_KEY_FRAME, header.frameSize, 0, null);
-      //Log.d(AviExtractor.TAG, "MP3: us=" + us);
       timeUs += header.samplesPerFrame * C.MICROS_PER_SECOND / samplesPerSecond;
     }
     chunkRemaining -= bytes;