diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index 7ece65cd..6c858dae 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -810,11 +810,11 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
 
     @Override
     public void directSubmitDecodeUnit(DecodeUnit du) {
-        int inputIndex;
+        int inputIndex = -1;
 
         notifyDuReceived(du);
 
-        for (;;) {
+        while (!Thread.currentThread().isInterrupted()) {
             try {
                 inputIndex = dequeueInputBuffer(true, true);
                 break;