diff --git a/.codespellrc b/.codespellrc index a8a3f3d1c..0dce5c469 100644 --- a/.codespellrc +++ b/.codespellrc @@ -2,4 +2,4 @@ check-filenames = builtin = clear,rare,usage,informal skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii -ignore-words-list = iterm,compiletime,intergrated,unknwn,pengwin,siduction,master,sur,doas +ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,sur,doas diff --git a/CHANGELOG.md b/CHANGELOG.md index 2987c30f8..96b3ad880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Config related changes: * The undocumented flag `--load-user-config` is removed. As an alternative, `--config none` can be used to disable loading config files. * `--config` (previously named `--load-config`) is now supported for command line arguments only. If specified, other config files won't be loaded, which works like other programs. * Config files will always be loaded before other command line flags being parsed. That is to say, command line flags will always override options defined in config files. +* the value of GPUType `integrated` contained a typo and was fixed. Existing config files may need to be updated. We are deprecating flags based config files (will be removed in v3.0.0). We suggest you migrate to json based config files. diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index da996c3c5..0e2fdbd8b 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -151,7 +151,6 @@ bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char { options->hideType = (FFGPUType) ffOptionParseEnum(key, value, (FFKeyValuePair[]) { { "none", FF_GPU_TYPE_UNKNOWN }, - { "intergrated", FF_GPU_TYPE_INTEGRATED }, // for backward compatibility only { "integrated", FF_GPU_TYPE_INTEGRATED }, { "discrete", FF_GPU_TYPE_DISCRETE }, {}, @@ -197,7 +196,6 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { { "none", FF_GPU_TYPE_UNKNOWN }, - { "intergrated", FF_GPU_TYPE_INTEGRATED }, // for backward compatibility only { "integrated", FF_GPU_TYPE_INTEGRATED }, { "discrete", FF_GPU_TYPE_DISCRETE }, {},