diff --git a/src/com/limelight/binding/LibraryHelper.java b/src/com/limelight/binding/LibraryHelper.java
index fc57902..cb254d0 100644
--- a/src/com/limelight/binding/LibraryHelper.java
+++ b/src/com/limelight/binding/LibraryHelper.java
@@ -17,19 +17,7 @@ public class LibraryHelper {
 	static {
 		needsDependencyExtraction = System.getProperty("os.name").contains("Windows");
 		libraryExtractionFolder = System.getProperty("java.io.tmpdir", ".");
-		
-		// AVC dependencies
-		if (System.getProperty("os.name").contains("Windows")) {
-			avcDependencies.add("avutil-52");
-			avcDependencies.add("swresample-0");
-			avcDependencies.add("swscale-2");
-			avcDependencies.add("avcodec-55");
-			avcDependencies.add("avformat-55");
-			avcDependencies.add("avfilter-3");
-			avcDependencies.add("postproc-52");
-			avcDependencies.add("pthreadVC2");
-		}
-		
+
 		// The AVC JNI library itself
 		avcDependencies.add("nv_avc_dec");
 	}
diff --git a/src/com/limelight/binding/PlatformBinding.java b/src/com/limelight/binding/PlatformBinding.java
index c139e2b..cbf0583 100644
--- a/src/com/limelight/binding/PlatformBinding.java
+++ b/src/com/limelight/binding/PlatformBinding.java
@@ -4,7 +4,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import com.limelight.binding.audio.JavaxAudioRenderer;
-import com.limelight.binding.video.SwingCpuDecoderRenderer;
+import com.limelight.binding.video.OmxDecoderRenderer;
 import com.limelight.nvstream.av.audio.AudioRenderer;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 
@@ -18,7 +18,7 @@ public class PlatformBinding {
 	 * @return a video decoder and renderer
 	 */
 	public static VideoDecoderRenderer getVideoDecoderRenderer() {
-		return new SwingCpuDecoderRenderer();
+		return new OmxDecoderRenderer();
 	}
 	
 	/**
@@ -30,7 +30,7 @@ public class PlatformBinding {
 		try {
 			return InetAddress.getLocalHost().getHostName();
 		} catch (UnknownHostException e) {
-			return "LimelightPC";
+			return "LimelightPi";
 		}
 	}