summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorGravatar bunnei2021-12-18 02:33:07 -0800
committerGravatar GitHub2021-12-18 02:33:07 -0800
commit2030522d86d1fac7ef95396b9d59d5cdedd7b892 (patch)
tree55ddefd392b4c3514264282b78a882bfea956bb0 /.gitmodules
parentMerge pull request #7596 from Tatsh/externals-sdl-config-joycon-fix (diff)
parentexternals/ffmpeg: set the cmake variable twice ... (diff)
downloadyuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.gz
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.tar.xz
yuzu-2030522d86d1fac7ef95396b9d59d5cdedd7b892.zip
Merge pull request #7587 from liushuyu/fix-linux-decoding
[Patch v2] externals/ffmpeg: refactor ffmpeg searching and handling in cmake
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index dc6ed500f..a9cf9a24a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,12 +34,12 @@
34[submodule "opus"] 34[submodule "opus"]
35 path = externals/opus/opus 35 path = externals/opus/opus
36 url = https://github.com/xiph/opus.git 36 url = https://github.com/xiph/opus.git
37[submodule "ffmpeg"]
38 path = externals/ffmpeg
39 url = https://git.ffmpeg.org/ffmpeg.git
40[submodule "SDL"] 37[submodule "SDL"]
41 path = externals/SDL 38 path = externals/SDL
42 url = https://github.com/libsdl-org/SDL.git 39 url = https://github.com/libsdl-org/SDL.git
43[submodule "externals/cpp-httplib"] 40[submodule "externals/cpp-httplib"]
44 path = externals/cpp-httplib 41 path = externals/cpp-httplib
45 url = https://github.com/yhirose/cpp-httplib.git 42 url = https://github.com/yhirose/cpp-httplib.git
43[submodule "externals/ffmpeg/ffmpeg"]
44 path = externals/ffmpeg/ffmpeg
45 url = https://git.ffmpeg.org/ffmpeg.git