diff --git a/src/com/limelight/binding/video/OmxDecoderRenderer.java b/src/com/limelight/binding/video/OmxDecoderRenderer.java
index 459ffb6..8b07494 100644
--- a/src/com/limelight/binding/video/OmxDecoderRenderer.java
+++ b/src/com/limelight/binding/video/OmxDecoderRenderer.java
@@ -4,7 +4,6 @@ import com.limelight.nvstream.av.ByteBufferDescriptor;
 import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 
 /**
@@ -12,6 +11,8 @@ import java.util.List;
  * @author Iwan Timmer
  */
 public class OmxDecoderRenderer implements VideoDecoderRenderer {
+	
+	private final static int BITSTREAM_RESTRICTIONS = (int) 0xF1832C00l;
 
 	@Override
 	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
@@ -42,6 +43,27 @@ public class OmxDecoderRenderer implements VideoDecoderRenderer {
 	public boolean submitDecodeUnit(DecodeUnit decodeUnit) {
 		boolean ok = true;
 		List<ByteBufferDescriptor> units = decodeUnit.getBufferList();
+		
+		ByteBufferDescriptor header = units.get(0);
+ 		if (header.data[header.offset+4] == 0x67) {
+			byte last = header.data[header.length+header.offset-1];
+			//Start bit before stop bit
+			int shift = (Integer.numberOfLeadingZeros(last & - last) - 1)%8;
+			int bitstream_restriction = BITSTREAM_RESTRICTIONS >>> shift;
+			boolean twoBytes = shift==7;
+			int index = header.length + header.offset - (twoBytes?2:1);
+			
+			header.data[index] = (byte) (((int) header.data[index] & 0xFF) | (bitstream_restriction >>> 24));
+			header.data[index+1] = (byte) ((twoBytes?((int) header.data[index+1] & 0xFF):0) | (bitstream_restriction >>> 16));
+			header.data[index+2] = (byte) (bitstream_restriction >>> 8);
+			header.length += twoBytes?1:2;
+			
+			if (Integer.numberOfTrailingZeros(bitstream_restriction) < 8) {
+				header.data[index+3] = (byte) (bitstream_restriction);
+				header.length++;
+			}
+		}
+		
 		for (int i=0;i<units.size();i++) {
 			ByteBufferDescriptor bbd = units.get(i);
 			if (ok)