diff --git a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index f1c2053f..85a7b4ff 100644
--- a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -121,7 +121,8 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 				BufferInfo info = new BufferInfo();
 				while (!isInterrupted())
 				{
-					int outIndex = videoDecoder.dequeueOutputBuffer(info, 100);
+					// Block for a maximum of 100 ms
+					int outIndex = videoDecoder.dequeueOutputBuffer(info, 100000);
 				    switch (outIndex) {
 				    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
 				    	System.out.println("Output buffers changed");