diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index e973b70204..dbfeed4063 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -1001,7 +1001,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         codecAdapter = new MultiLockAsyncMediaCodecAdapter(codec, getTrackType());
         ((MultiLockAsyncMediaCodecAdapter) codecAdapter).start();
       } else {
-        codecAdapter = new SynchronousMediaCodecAdapter(codec, getDequeueOutputBufferTimeoutUs());
+        codecAdapter = new SynchronousMediaCodecAdapter(codec);
       }
 
       TraceUtil.endSection();
@@ -1460,15 +1460,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
                 && SystemClock.elapsedRealtime() < codecHotswapDeadlineMs));
   }
 
-  /**
-   * Returns the maximum time to block whilst waiting for a decoded output buffer.
-   *
-   * @return The maximum time to block, in microseconds.
-   */
-  protected long getDequeueOutputBufferTimeoutUs() {
-    return 0;
-  }
-
   /**
    * Returns the {@link MediaFormat#KEY_OPERATING_RATE} value for a given renderer operating rate,
    * current {@link Format} and set of possible stream formats.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
index 8caf72ecf4..7dd7ef8f20 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
@@ -24,11 +24,9 @@ import android.media.MediaFormat;
  */
 /* package */ final class SynchronousMediaCodecAdapter implements MediaCodecAdapter {
   private final MediaCodec codec;
-  private final long dequeueOutputBufferTimeoutMs;
 
-  public SynchronousMediaCodecAdapter(MediaCodec mediaCodec, long dequeueOutputBufferTimeoutMs) {
+  public SynchronousMediaCodecAdapter(MediaCodec mediaCodec) {
     this.codec = mediaCodec;
-    this.dequeueOutputBufferTimeoutMs = dequeueOutputBufferTimeoutMs;
   }
 
   @Override
@@ -38,7 +36,7 @@ import android.media.MediaFormat;
 
   @Override
   public int dequeueOutputBufferIndex(MediaCodec.BufferInfo bufferInfo) {
-    return codec.dequeueOutputBuffer(bufferInfo, dequeueOutputBufferTimeoutMs);
+    return codec.dequeueOutputBuffer(bufferInfo, 0);
   }
 
   @Override