diff options
| author | bunnei <[email protected]> | 2021-12-15 00:03:20 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-15 00:03:20 -0800 |
| commit | 2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8 (patch) | |
| tree | 486a47945aa83e2842f54dce2e9f153d396a1886 /.gitmodules | |
| parent | 156215d1faf8a74379e54409304e90384b59c8af (diff) | |
| parent | 2f32133ad5e13503c56bc5c910407a27cc23908b (diff) | |
| download | yuzu-android-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.tar.gz yuzu-android-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 @@ [submodule "opus"] path = externals/opus/opus url = https://github.com/xiph/opus.git +[submodule "ffmpeg"] + path = externals/ffmpeg + url = https://git.ffmpeg.org/ffmpeg.git [submodule "SDL"] path = externals/SDL url = https://github.com/libsdl-org/SDL.git [submodule "externals/cpp-httplib"] path = externals/cpp-httplib url = https://github.com/yhirose/cpp-httplib.git -[submodule "externals/ffmpeg/ffmpeg"] - path = externals/ffmpeg/ffmpeg - url = https://git.ffmpeg.org/ffmpeg.git |