[FFmpeg-devel] [PATCH] fftools: Fix preset search pathes (regression since 13350e81fd)

* [FFmpeg-devel] [PATCH] fftools: Fix preset search pathes (regression since 13350e81fd)
@ 2022-06-30 10:40 Nicolas Gaullier
  2022-07-05  8:46 ` Nicolas Gaullier
  0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Gaullier @ 2022-06-30 10:40 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Nicolas Gaullier

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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread