Message ID | 20220630104035.765-1-nicolas.gaullier@cji.paris |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel] fftools: Fix preset search pathes (regression since 13350e81fd) | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
>Envoyé : jeudi 30 juin 2022 12:41 >Objet : [PATCH] fftools: Fix preset search pathes (regression since 13350e81fd) > >Fix looking for .ffmpeg subfolder in FFMPEG_DATADIR and inversely not in HOME. >Fix search order (documentation). It seems I have not received any feedback for this simple fix ? Please tell me if there is anything I should amend about the comments or whatever. Thanks. Nicolas
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 69a6f54ea3..fcaefb9f1e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -822,8 +822,8 @@ FILE *get_preset_file(char *filename, size_t filename_size, #endif char *env_home = getenv_utf8("HOME"); char *env_ffmpeg_datadir = getenv_utf8("FFMPEG_DATADIR"); - const char *base[3] = { env_home, - env_ffmpeg_datadir, + const char *base[3] = { env_ffmpeg_datadir, + env_home, /* HOME is special: search in a .ffmpeg subfolder */ FFMPEG_DATADIR, }; if (is_path) {