diff options
| author |  Mai M | 2022-02-28 19:51:10 -0500 |
|---|---|---|
| committer |  GitHub | 2022-02-28 19:51:10 -0500 |
| commit | fdf81cd1129d737609ecf585c28c4fc84ae38b70 (patch) | |
| tree | 9416f4462637119fcc8d33f7817c9b3c375930f2 /externals | |
| parent | Merge pull request #7955 from bunnei/update-dynarmic (diff) | |
| parent | ffmpeg: Fix mis-maching argument warning for endif (diff) | |
| download | yuzu-fdf81cd1129d737609ecf585c28c4fc84ae38b70.tar.gz yuzu-fdf81cd1129d737609ecf585c28c4fc84ae38b70.tar.xz yuzu-fdf81cd1129d737609ecf585c28c4fc84ae38b70.zip | |
Merge pull request #7966 from merryhime/cmake-ffmpeg-endif
ffmpeg: Fix mis-maching argument warning for endif
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index be8325b47..dcc978827 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt | |||
| @@ -214,6 +214,6 @@ else(WIN32) | |||
| 214 | set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) | 214 | set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) |
| 215 | set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) | 215 | set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) |
| 216 | set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) | 216 | set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) |
| 217 | endif(WIN32) | 217 | endif() |
| 218 | 218 | ||
| 219 | unset(FFmpeg_COMPONENTS) | 219 | unset(FFmpeg_COMPONENTS) |