Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Gaullier <nicolas.gaullier@cji.paris>2022-06-30 13:40:35 +0300
committerTimo Rothenpieler <timo@rothenpieler.org>2022-07-08 14:58:49 +0300
commitd3cf7be5a4bd0c6bb80032c7697a8819563112c8 (patch)
tree38bc2323e0b6d5b62805eb31db26fc97a8bad0cb /fftools/cmdutils.c
parent59018254c7a178e4650ef63016493c75383a2076 (diff)
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). Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'fftools/cmdutils.c')
-rw-r--r--fftools/cmdutils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 69a6f54ea3..18e768b386 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, /* index=1(HOME) is special: search in a .ffmpeg subfolder */
FFMPEG_DATADIR, };
if (is_path) {