[FFmpeg-devel] [PATCH] fftools: Fix preset search pathes (regression since 13350e81fd)
Nicolas Gaullier
nicolas.gaullier at cji.paris
Thu Jun 30 13:40:35 EEST 2022
Fix looking for .ffmpeg subfolder in FFMPEG_DATADIR and inversely not in HOME.
Fix search order (documentation).
---
fftools/cmdutils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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) {
--
2.11.0
More information about the ffmpeg-devel
mailing list