diff options
| author |  bunnei | 2021-12-15 00:03:20 -0800 |
|---|---|---|
| committer |  GitHub | 2021-12-15 00:03:20 -0800 |
| commit | 2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8 (patch) | |
| tree | 486a47945aa83e2842f54dce2e9f153d396a1886 /.gitmodules | |
| parent | Merge pull request #7565 from liushuyu/fix-linux-decoding (diff) | |
| parent | Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake" (diff) | |
| download | yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.tar.gz yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.tar.xz yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.zip | |
Merge pull request #7589 from yuzu-emu/revert-7565-fix-linux-decoding
Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake"
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index a9cf9a24a..dc6ed500f 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 | ||
| 37 | [submodule "SDL"] | 40 | [submodule "SDL"] |
| 38 | path = externals/SDL | 41 | path = externals/SDL |
| 39 | url = https://github.com/libsdl-org/SDL.git | 42 | url = https://github.com/libsdl-org/SDL.git |
| 40 | [submodule "externals/cpp-httplib"] | 43 | [submodule "externals/cpp-httplib"] |
| 41 | path = externals/cpp-httplib | 44 | path = externals/cpp-httplib |
| 42 | url = https://github.com/yhirose/cpp-httplib.git | 45 | 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 | ||