From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0769F43843 for ; Thu, 30 Jun 2022 10:40:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85F9F68B64B; Thu, 30 Jun 2022 13:40:47 +0300 (EEST) Received: from srv-infra-1.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48A5B68B456 for ; Thu, 30 Jun 2022 13:40:41 +0300 (EEST) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id EB87121574; Thu, 30 Jun 2022 10:40:39 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 12:40:35 +0200 Message-Id: <20220630104035.765-1-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.36.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools: Fix preset search pathes (regression since 13350e81fd) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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".