From 50eda65a1469c8cca81c0ceafe650771d6bf4a55 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 19 Aug 2013 09:24:31 -0700
Subject: [PATCH] Switch to the official FFMS2 git repo now that there is one

---
 .gitmodules | 4 ++--
 deps/ffms2  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bafc7a8ad..1ab3d8437 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,8 +24,8 @@
 	ignore = dirty
 [submodule "deps/ffms2"]
 	path = deps/ffms2
-	url = git://github.com/tgoyne/ffms2.git
-	branch = trunk
+	url = git://github.com/FFMS/ffms2.git
+	branch = master
 	ignore = dirty
 [submodule "deps/fontconfig"]
 	path = deps/fontconfig
diff --git a/deps/ffms2 b/deps/ffms2
index 01f8e79aa..194dd0f64 160000
--- a/deps/ffms2
+++ b/deps/ffms2
@@ -1 +1 @@
-Subproject commit 01f8e79aaaaa09bc8f2f79ed632e7240eff452c9
+Subproject commit 194dd0f6416deb05017a08f73833a387aebd8c32