Merge branch 'master' of https://github.com/avesus/guruchat

avesus · Jul 7, 2014 · 069881a · 069881a
2 parents d89c7d7 + 7c7cb74
commit 069881a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,9 @@
 [submodule "thirdparty/libyuv"]
 	path = thirdparty/libyuv
 	url = https://chromium.googlesource.com/external/libyuv/
+[submodule "thirdparty/x264"]
+	path = thirdparty/x264
+	url = git://git.videolan.org/x264.git
+[submodule "thirdparty/ffmpeg"]
+	path = thirdparty/ffmpeg
+	url = git://source.ffmpeg.org/ffmpeg.git
diff --git a/thirdparty/ffmpeg b/thirdparty/ffmpeg
diff --git a/thirdparty/x264 b/thirdparty/x264