diff options
| author | liushuyu <[email protected]> | 2021-12-10 21:26:43 -0700 |
|---|---|---|
| committer | liushuyu <[email protected]> | 2021-12-13 17:48:05 -0700 |
| commit | f91b6fbbcb56870f912540550c9517800c152a46 (patch) | |
| tree | 98724b975ae157370815f6e0d663339856b87ca8 /.gitmodules | |
| parent | ccc0a1e621b32827dc6ebf9c0b54a58778cbab52 (diff) | |
| download | yuzu-android-f91b6fbbcb56870f912540550c9517800c152a46.tar.gz yuzu-android-f91b6fbbcb56870f912540550c9517800c152a46.zip | |
ffmpeg: move the whole tree into externals/ffmpeg/ffmpeg ...
* this resolves the todo items in the CMakeLists.txt
* a version requirement check for ffmpeg is added to catch issues early
* for future-proof reasons, nasm/yasm is now only required when build on
x86/AMD64 systems
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
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 @@ [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 |