diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
index e119f9a23e..193cd0d48d 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
@@ -591,6 +591,10 @@ public abstract class MediaCodecTrackRenderer extends SampleSourceTrackRenderer
         codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
       }
       inputStreamEnded = true;
+      if (!codecHasQueuedBuffers) {
+        processEndOfStream();
+        return false;
+      }
       try {
         if (codecNeedsEosPropagationWorkaround) {
           // Do nothing.