Skip to content

Commit 4587c45

Browse files
committed
MediaCapture: Improve FFmpeg load error message
1 parent 505753d commit 4587c45

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/util/media_capture.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ extern "C" {
5555
#include "libavformat/avformat.h"
5656
#include "libavformat/version.h"
5757
#include "libavutil/dict.h"
58+
#include "libavutil/ffversion.h"
5859
#include "libavutil/opt.h"
5960
#include "libavutil/pixdesc.h"
6061
#include "libavutil/version.h"
@@ -2023,18 +2024,18 @@ bool MediaCaptureFFmpeg::LoadFFmpeg(Error* error)
20232024

20242025
UnloadFFmpeg();
20252026

2026-
Error::SetStringFmt(
2027-
error,
2028-
TRANSLATE_FS(
2029-
"MediaCapture",
2030-
"You may be missing one or more files, or are using the incorrect version. This build of DuckStation requires:\n"
2031-
" libavcodec: {}\n"
2032-
" libavformat: {}\n"
2033-
" libavutil: {}\n"
2034-
" libswscale: {}\n"
2035-
" libswresample: {}\n"),
2036-
LIBAVCODEC_VERSION_MAJOR, LIBAVFORMAT_VERSION_MAJOR, LIBAVUTIL_VERSION_MAJOR, LIBSWSCALE_VERSION_MAJOR,
2037-
LIBSWRESAMPLE_VERSION_MAJOR);
2027+
Error::SetStringFmt(error,
2028+
TRANSLATE_FS("MediaCapture",
2029+
"FFmpeg was not found, or is not the correct version.\n"
2030+
"You can download FFmpeg from {}.\n"
2031+
"This build of DuckStation requires FFmpeg v{}, with library versions:\n"
2032+
" libavcodec: {}\n"
2033+
" libavformat: {}\n"
2034+
" libavutil: {}\n"
2035+
" libswscale: {}\n"
2036+
" libswresample: {}\n"),
2037+
"https://www.ffmpeg.org/", FFMPEG_VERSION, LIBAVCODEC_VERSION_MAJOR, LIBAVFORMAT_VERSION_MAJOR,
2038+
LIBAVUTIL_VERSION_MAJOR, LIBSWSCALE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MAJOR);
20382039
return false;
20392040
}
20402041

0 commit comments

Comments
 (0)