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 ef5052c398..b8c33ea110 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
@@ -530,7 +530,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
       inputIndex = -1;
       codecReinitState = REINIT_STATE_WAIT_END_OF_STREAM;
       return false;
-    } else if (codecReinitState != REINIT_STATE_NONE) {
+    } else if (codecReinitState == REINIT_STATE_WAIT_END_OF_STREAM) {
       // we are still waiting for the last samples to be output
       return false;
     }