diff --git a/.gitmodules b/.gitmodules
index 09e7a742cb..ccfc784c3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,9 @@
 	path = wxWidgets
 	url = https://github.com/wxWidgets/wxWidgets
 	ignore = dirty
-	branch = master
 [submodule "rpcs3-ffmpeg"]
 	path = ffmpeg
-	url = https://github.com/bigpet/ppsspp-ffmpeg
+	url = https://github.com/hrydgard/ppsspp-ffmpeg
 [submodule "asmjit"]
 	path = asmjit
 	url = https://github.com/kobalicek/asmjit
diff --git a/ffmpeg b/ffmpeg
index 994c2bc553..8dd84dc1ea 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 994c2bc5536026baa3aeb75218fa7db319ae16ba
+Subproject commit 8dd84dc1ea8bc70da1a345109383f62974a9c2fc
diff --git a/wxWidgets b/wxWidgets
index 328743bf2d..3b047b58ce 160000
--- a/wxWidgets
+++ b/wxWidgets
@@ -1 +1 @@
-Subproject commit 328743bf2d4cbab47ba1505fb063700bffdca0b8
+Subproject commit 3b047b58ceb4a0bf11a607b3a5a47697d70de946