summaryrefslogtreecommitdiff
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorZephyron <zephyron@noreply.git.citron-emu.org>2025-02-13 11:48:41 +0000
committerZephyron <zephyron@noreply.git.citron-emu.org>2025-02-13 11:48:41 +0000
commit1aad9fd4e3a8fb858f5ac1bbc28af7fcef39dec2 (patch)
tree0a0a57eab01a5147783890205a479948de6c65d6 /externals/ffmpeg
parentf45f339ef9f02610d79890c12844742a4541361e (diff)
revert f45f339ef9f02610d79890c12844742a4541361e
revert deps: update SDL2 and FFmpeg versions Update bundled dependencies to their latest stable versions: - SDL2: 2.28.2 -> 2.30.12 - FFmpeg: 6.0 -> 6.1.2 Also add citron copyright header to FFmpeg CMakeLists.txt
Diffstat (limited to 'externals/ffmpeg')
-rw-r--r--externals/ffmpeg/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 535e2ee02..790f7c8de 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -1,5 +1,4 @@
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
-# SPDX-FileCopyrightText: 2025 citron Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
if (NOT WIN32 AND NOT ANDROID)
@@ -255,7 +254,7 @@ elseif(ANDROID)
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
elseif(WIN32)
# Use citron FFmpeg binaries
- set(FFmpeg_EXT_NAME "ffmpeg-6.1.2")
+ set(FFmpeg_EXT_NAME "ffmpeg-6.0")
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
set(FFmpeg_FOUND YES)