summaryrefslogtreecommitdiff
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorGravatar liushuyu2021-12-15 00:53:22 -0700
committerGravatar liushuyu2021-12-15 21:17:33 -0700
commit476637d1435f031017abb06a42902b925dc08151 (patch)
tree98175e2b9542703be8f652613b1ad72bfa450b11 /externals/ffmpeg
parentexternals: fix a regression when using MSVC (diff)
downloadyuzu-476637d1435f031017abb06a42902b925dc08151.tar.gz
yuzu-476637d1435f031017abb06a42902b925dc08151.tar.xz
yuzu-476637d1435f031017abb06a42902b925dc08151.zip
externals/ffmpeg: set the cmake variable twice ...
... to avoid leaving variable undefined in the current scope
Diffstat (limited to 'externals/ffmpeg')
-rw-r--r--externals/ffmpeg/CMakeLists.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 93bd06fd7..c57b54f77 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -192,7 +192,7 @@ if (NOT WIN32)
192else(WIN32) 192else(WIN32)
193 # Use yuzu FFmpeg binaries 193 # Use yuzu FFmpeg binaries
194 set(FFmpeg_EXT_NAME "ffmpeg-4.4") 194 set(FFmpeg_EXT_NAME "ffmpeg-4.4")
195 set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}" PARENT_SCOPE) 195 set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
196 download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") 196 download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
197 set(FFmpeg_FOUND YES) 197 set(FFmpeg_FOUND YES)
198 set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE) 198 set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)
@@ -200,10 +200,15 @@ else(WIN32)
200 set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE) 200 set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE)
201 set(FFmpeg_DLL_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE) 201 set(FFmpeg_DLL_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE)
202 set(FFmpeg_LIBRARIES 202 set(FFmpeg_LIBRARIES
203 ${FFmpeg_LIBRARY_DIR}/swscale.lib 203 ${FFmpeg_LIBRARY_DIR}/swscale.lib
204 ${FFmpeg_LIBRARY_DIR}/avcodec.lib 204 ${FFmpeg_LIBRARY_DIR}/avcodec.lib
205 ${FFmpeg_LIBRARY_DIR}/avutil.lib 205 ${FFmpeg_LIBRARY_DIR}/avutil.lib
206 CACHE PATH "Paths to FFmpeg libraries" FORCE) 206 CACHE PATH "Paths to FFmpeg libraries" FORCE)
207 # exported variables
208 set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
209 set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
210 set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
211 set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
207endif(WIN32) 212endif(WIN32)
208 213
209unset(FFmpeg_COMPONENTS) 214unset(FFmpeg_COMPONENTS)