From patchwork Fri Feb 18 19:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213170nkx; Fri, 18 Feb 2022 11:12:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsvOTVwDQ4IwBQfqmuRSoZo1zFDqxwbCPBjRlCZSGcB0lihBx7xba/BX2gJNHzz6qoUrrn X-Received: by 2002:a17:907:971b:b0:6cf:d2cf:d867 with SMTP id jg27-20020a170907971b00b006cfd2cfd867mr7598570ejc.669.1645211544835; Fri, 18 Feb 2022 11:12:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211544; cv=none; d=google.com; s=arc-20160816; b=etexrCSivNUlYyPuEZ0QDlAGb4QQVM48Z2YHyYlL0lsutQth7Od8HoGwcC0fWcREv3 48xoWnVHr1kb1+30ClaevwOvB5OLc1sv8rDT+gCw34cgTDHM57O6f+cAFOUvUahh2R9s bfJSjySWTVQAYjmnxBKZl2+Y/jHN4TI3u7xiFkrkUW5XY8WJ1Hyv+sGYFFsG+xmuZfMD WdF5okQKQWa/s19lRc2rfZsgrgf++U9sf7ylFm+seNJW/iGB8fgBoVydJBIxuU+LWF0w b8J4zEUSAmcF4c+t6ufY+0uhFPUkuIMJBbf1aY1YKWfzge8Z5UghYU20Ein2evieOS/F JpvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=MABY2sERUPHoszs9VPL6ClUNuHj+2YtsINO/6QOouZU=; b=0sex6uMP4Yj3G6Ef1zp1E9NiDv9+/uRez7ZXFFB4y8dLp3jrsQNMUItCbeuvuXVXOB WQIH28YkFI1KXLpo/ukJfk7wEOB6noNR6zWHYVfrfFKBjI8dno7skrXJSswy1dvRYvUd vViYqifCknj+CvkKAruSQW5THQ4RbcaixZEkp7iO1VriD8qEKbh+RGOCiHtFva7LPi07 xqjGtAzSu7lesoyzRyhzPoAnZ9rvFRECgHtkxDutoh8J465bRfFs+xuBu9pJHA1dyiVT ff93OrZ/rQovFPAj+tEBnRSTd9RAuIPue2I1iP99abdfbRWbZ49aoTWkn6AbNyTpCKyL nogA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="Cm0q/3Pp"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n12si1317569eja.800.2022.02.18.11.12.24; Fri, 18 Feb 2022 11:12:24 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="Cm0q/3Pp"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC35968A785; Fri, 18 Feb 2022 21:12:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 411E86801C8 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211527; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Cm0q/3PpOHj5vDrXs/ZBskUk85cchkiqgk/m7OOaEjl79+axMXpKXZBAK/HDU+Tpq FyCVdW5obLDJ6iMmApKo9VYUMd422xynLrDCYPT5CIflGNa6ZibiGYAaNAmNnmbCyT KYGuO7vAr8k87IaUTlePkRFEKib9RujUpD4vCThY= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:07 +0100 (CET) X-EA-Auth: tv3YkfSoPTCHMCOlzy15GkyA0ux5n78ryBslRXAN+FiR+CB8CsdAyaDzdN9YtB6TcdAdBkYbpWUCi2MfseyfkVEJBNWt1imHpXpq2b6RyJc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:52 +0300 Message-Id: <20220218191157.15429-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 1/6] libavutil/wchar_filename.h: Add wchartoansi and utf8toansi 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d0YonhmeWbyA These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c when replacing MAX_PATH-sized buffers with dynamically sized ones. --- libavutil/wchar_filename.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..32260a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,43 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, *filename_w, num_chars); return 0; } + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + const int num_chars = WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = (char *)av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int utf8toansi(const char *filename_utf8, char **filename) +{ + wchar_t *filename_w = NULL; + int ret = -1; + if (utf8towchar(filename_utf8, &filename_w)) + return -1; + + if (!filename_w) { + *filename = NULL; + return 0; + } + + ret = wchartoansi(filename_w, filename); + av_free(filename_w); + return ret; +} #endif #endif /* AVUTIL_WCHAR_FILENAME_H */ From patchwork Fri Feb 18 19:11:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213404nkx; Fri, 18 Feb 2022 11:12:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2Mo4SD5TdmMJE9lPdS5vfI4395Bp9j1u0DoeqSDAkVh27TRe2CUuynYmKjPjXnw319PCz X-Received: by 2002:a17:906:b28b:b0:6cc:734c:812d with SMTP id q11-20020a170906b28b00b006cc734c812dmr7486347ejz.657.1645211561677; Fri, 18 Feb 2022 11:12:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211561; cv=none; d=google.com; s=arc-20160816; b=QcHDt+g28964VX3qWMUnkGGKpBUnhYsm5qB0HbParAgeW0mJnLwJhnFLmIZuiBnEEX fFRjAIoCIya2/w/oiHdER4RtQqToJHFhxwHTfwSly2h+sIiupQUZSbGE61+2NNGO+NV5 D2QEQLZzR9ruc2czO8Zi/B+BgMfs6/kAAoLqqlfn0ji7cdY9rkgi/0ENl1dKuNbV6DWe qjmwANvx1lmzEVM6zP70L/+iCFMgCVMwVoMHZSFvSofaZTBau38MK6v3nZ0KLj9ZkXi/ wPgqPxb3RxkhMRsOBqPPe3lHv01WvOdzCGXmrM400ibxpBD/YYvi7SrlfOSvgc2gUYKN sq6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=hCVbt+lzr4OAhA3TV9+Jn55D7w0xjewMlwp0jEIwql4=; b=R9AIQVExF9nV9YtZu5lwedacFg/Pgl2v3XvW/bExTZKtq8UfPd14y3Fmg7ur5YIysR 40h+sPsnbavHz4hDTzReISXiIKpYPyH0Kx3Hkpp966MiaqNej58WM9uL/O4tVQHF8RWa vnbycy7f2BxeUlGxQDCxwPWbkPzG2uiw3JfajRBr2MaTiDA/Zr8F3Y9XT7bftx9mo5uL 7DcY973K6RjN6mA0fFWmF5bAcNMmp31A2sVk7sXuuwL2iySJn6Uk3YAD/68A0zm8/1YR R/HZxji5aXmxELUZbQYUqoJKCW7zpUwQgvoGk2fmxSLmytATSwseYe3iY2GdRO+yqm+X XBzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=WHUWCtat; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b6si7343007edd.632.2022.02.18.11.12.41; Fri, 18 Feb 2022 11:12:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=WHUWCtat; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FA7968A305; Fri, 18 Feb 2022 21:12:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49004680266 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211528; bh=IIZWG4Ae6e2j6qda26O/yamptBIE8ZqN2zc7+FhoQ0I=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=WHUWCtat/SEBrRliVASWoh3MevsumSecBUhvPH7IjcjHec7WCHFdcRL2jToLGr9b9 qxNAXSjk9+RlTtpZTxohlmP/cFCHy6iHzVm2WIUoSaYQtEudFmWu8oBgY+bxjc0y+j e77XEq7Qsx6+Q9ROQPLgM2H5IIDTmCsCIiOls4+E= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:08 +0100 (CET) X-EA-Auth: OMDdQk6DkyYce54jq2KfwmKPgcz5soSr5pnlgAHzcJp3h/716KZpbD2c+tj9XpF1iy9a4kCoNqyztVDPsTusURvEn9kQsWBocvRiXRsYumc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:53 +0300 Message-Id: <20220218191157.15429-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/6] libavformat/avisynth.c: Replace MAX_PATH-sized buffers with dynamically sized ones 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ggcO9jl0pkcX --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8bc3986..219f307 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -36,6 +36,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -806,8 +807,7 @@ static int avisynth_open_file(AVFormatContext *s) AVS_Value arg, val; int ret; #ifdef _WIN32 - char filename_ansi[MAX_PATH * 4]; - wchar_t filename_wc[MAX_PATH * 4]; + char *filename_ansi = NULL; #endif if (ret = avisynth_context_create(s)) @@ -815,10 +815,12 @@ static int avisynth_open_file(AVFormatContext *s) #ifdef _WIN32 /* Convert UTF-8 to ANSI code page */ - MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4); - WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi, - MAX_PATH * 4, NULL, NULL); + if (utf8toansi(s->url, &filename_ansi)) { + ret = AVERROR_UNKNOWN; + goto fail; + } arg = avs_new_value_string(filename_ansi); + av_free(filename_ansi); #else arg = avs_new_value_string(s->url); #endif From patchwork Fri Feb 18 19:11:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34393 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213516nkx; Fri, 18 Feb 2022 11:12:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjPJM3lk8kZHt52dp49Q9IKNRV8Ezvop/xm8adLtMnX1ht9e0fjPfhMP4nAfUMsnpI0WIx X-Received: by 2002:a17:906:6b8e:b0:6cd:7d22:e5b6 with SMTP id l14-20020a1709066b8e00b006cd7d22e5b6mr7963630ejr.259.1645211571485; Fri, 18 Feb 2022 11:12:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211571; cv=none; d=google.com; s=arc-20160816; b=s38rHeLqvdXctijbbdFuxs7mHFaZn8R4/UDwaBcbS9Qqw/nAt7MYYItjhmZaE2zAyb NmpPS4un2Uaf/xw/BVsbweKAJxwzjr5YVNEsN+YWCVuUB3UzdMZ+Dn/tUeOVhqb2cCRw M727vvwUcoojrn5WVAVWSlcmRWoLEmwX4WXherIFVnNwBpFswxFPzDZ9aVpGAOUbUlsR DpSQApmjC2KFLjUZS9N91vKoAMjUMgNtCsk5nTO2soqQ6WIG6GUiYnPcI2OzMliS49dX 2fu0MNBWsTxf9WgxUqbLGSzTXyXO/Hb27hyk90pEysHBFCb+5cCPu2tNgZfnPxL+VGuN ZlPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=bPHl+A3f3NrnVF3zAK4GFJjqfzDO0FUm+bQDlfgmPwo=; b=Yxp+1GLJ5y/WryJlqzNMem3S17YNlaVuzOSYnxmPRwbICDOgvQ2DyPM2arlTYbLV6m h3rJnoY4GNjtFrpyyKVnv2vlWXEruQi4ISRLyjeU9KqaIrRmDCJBcJCPOLDW4kESNpT6 /vTEWOIPMV/X2skEjyoI1CLjHiOGLjy8p64qM320PBAEAHDukkziLWj347jfCoTnS0l9 zO3kGc7KXay0qrj10mQq7RVT9YPrqHHKEx/F8fRlEO2Sn0t5ZIzaQVDWB24qkwqCtFdo jExPxHncm6DD2zMmfllo1W5pWpepJMl8v69r01YZELb+/K6oYbyEV5y6KouJw9hgivU5 rDKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=XpnkS7q0; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw9si4702178ejc.247.2022.02.18.11.12.51; Fri, 18 Feb 2022 11:12:51 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=XpnkS7q0; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57A3768B18F; Fri, 18 Feb 2022 21:12:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 517626897E7 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211529; bh=Yjx7eV17kp5L23zKB69r5J1UQAazjkTgmtV3lBgZbYg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=XpnkS7q0S+18ZVF8YU4+NqG5jmUQzYnJbKRTQlMiyoMaxd7apd7Q9MWEq1JcRHah8 ePG29IE9tC8X8IOFsOaPg11ZtptzNVhjDhMuxCuK+leZDKxTAVIE6OoPBhl3umC1z2 ZukKJ98n/CXPBFcpyRSYp1Kwa9ZTs/PL/b11HxZ0= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:08 +0100 (CET) X-EA-Auth: 9H4zePtrUyViChXpWI3NmZzVzEhVe7b1Bn07HNYCbT0+cq7CW8CLnnhK4POlkXhi5pCqu7+3e74X/iklHFjk17IgFSlsFcVlYWywEiFg3cQ= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:54 +0300 Message-Id: <20220218191157.15429-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 3/6] compat/w32dlfcn.h: Replace MAX_PATH-sized buffers with dynamically sized ones 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 44TcXweTPtaB Also replaces a call to LoadLibraryExA with LoadLibraryExW since ANSI functions do not support long paths. --- compat/w32dlfcn.h | 74 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..a8ac780 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -25,6 +25,30 @@ #if (_WIN32_WINNT < 0x0602) || HAVE_WINRT #include "libavutil/wchar_filename.h" #endif + +static inline wchar_t *get_module_filename(const HMODULE module) +{ + wchar_t *path = NULL; + int path_size = 0, path_len = 0; + + do { + path_size = path_size ? 1.5 * path_size : MAX_PATH; + wchar_t *new_path = av_realloc_array(path, path_size, sizeof *path); + if (!new_path) { + av_free(path); + return NULL; + } + path = new_path; + path_len = GetModuleFileNameW(module, path, path_size); + } while (path_len && path_size <= 32768 && path_size <= path_len); + + if (!path_len) { + av_free(path); + return NULL; + } + return path; +} + /** * Safe function used to open dynamic libs. This attempts to improve program security * by removing the current directory from the dll search path. Only dll's found in the @@ -34,28 +58,50 @@ */ static inline HMODULE win32_dlopen(const char *name) { + wchar_t *name_w = NULL; + if (utf8towchar(name, &name_w)) + name_w = NULL; #if _WIN32_WINNT < 0x0602 // Need to check if KB2533623 is available if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { HMODULE module = NULL; - wchar_t *path = NULL, *name_w = NULL; - DWORD pathlen; - if (utf8towchar(name, &name_w)) + wchar_t *path = NULL, *new_path = NULL; + DWORD pathlen, pathsize, namelen; + if (!name_w) goto exit; - path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); + namelen = wcslen(name_w); // Try local directory first - pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); - pathlen = wcsrchr(path, '\\') - path; - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + path = get_module_filename(NULL); + if (!path) goto exit; - path[pathlen] = '\\'; + new_path = wcsrchr(path, '\\'); + if (!new_path) + goto exit; + pathlen = new_path - path; + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (module == NULL) { // Next try System32 directory - pathlen = GetSystemDirectoryW(path, MAX_PATH); - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) goto exit; + if (pathlen + namelen + 2 > pathsize) { + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; + // The buffer might have been not enough for system directory + // in the first place. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } path[pathlen] = '\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); @@ -73,15 +119,17 @@ exit: # define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 #endif #if HAVE_WINRT - wchar_t *name_w = NULL; int ret; - if (utf8towchar(name, &name_w)) + if (!name_w) return NULL; ret = LoadPackagedLibrary(name_w, 0); av_free(name_w); return ret; #else - return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + /* filename may be be in CP_ACP */ + if (!name_w) + return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + return LoadLibraryExW(name_w, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); #endif } #define dlopen(name, flags) win32_dlopen(name) From patchwork Fri Feb 18 19:11:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213649nkx; Fri, 18 Feb 2022 11:13:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJ0k5auaWI/ghcNoTNN3316wPaedANXOTpyxXJC2XAgY9BcAA7Lulv6WaEtY9cGN9gxDOW X-Received: by 2002:a17:906:b57:b0:6ce:e31a:524 with SMTP id v23-20020a1709060b5700b006cee31a0524mr7486879ejg.290.1645211581604; Fri, 18 Feb 2022 11:13:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211581; cv=none; d=google.com; s=arc-20160816; b=P1zAoG+4bIjkpvA8lidMiby96B4lKIQbObO3ew9T6vqdMl0rkw76OrcozXr5sbrRRF G4CGuJEmPl7YdcRda7/tPHrk/OL0rM19jFfNYr65aAXuFkzugcDyPxEJ0e/sKH2Py25G IfAagqq5IZYUv/YUq91BSQnCpxLzjQ2eRIz6JsyQvGP64z/Z4IEBUJJRA0YdgemAJ1AI 8m+0xVKonNuSnGS6H1Oe3kh6lNuJ0Olb9JtHJ8pPARukIBcUUhCRsjv+p37nA4kj382p 6FegfnL6dCkb9IqIxziMfcLL8wg7nOe+VxMdxtcscjqu7aK2/SPT5DoupPrhh1vhXa9H H5qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Jus3V+hYsx0Sk6+ULPS4YUwfqYazm/2FDMP3GUECa98=; b=03YIEkZyUApjKK5cAlr7LhmqJAA1Ac/Q+YnCfI0SRaPefTe1u5aavZimUpj5C4xw1V bnoPk2rSJcXAobEzVxVRkIRy62YBB1ZgI27CbdnHxYCl+frAvplGMN6ccD1+UyF6SV31 +UqaxD+DgV6l7uyIPnXFemZ4V6tCy8Xe5ti66VPPvNFfzPk06TBHExNX/+4dwdXqAWyP f3yJKc3C2bxHTmbXUYBwP42dWYQZVnNgeLfWBpX8ge/i/YkcFTwl58dwYuBXD17tDlII drPNIxKfTLJpBc2gm4YpoYzk0j4tdU/DJPirPKG2FswwcFbuwPbOykfdYr8kpmKVyiQB 3prg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mNykK1nI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ca20si6266448edb.378.2022.02.18.11.13.01; Fri, 18 Feb 2022 11:13:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mNykK1nI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E24F68A927; Fri, 18 Feb 2022 21:12:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 361046801C8 for ; Fri, 18 Feb 2022 21:12:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211529; bh=ihJmQtPkMxCXyMfDX/vGTU/uwt1eFCciJKErDl6EH80=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=mNykK1nIQbM9hcVLcJrkEhmnztf1xDyn7dtOJbzC0pGDI3GIYv12rNGlp4TqcFiWf qfVFKu2gW4KFaWg73rf+asqzsQ3sK/9ZlnNIjOAXgMsvzyAxj8I6u+VzBiAYC6lij5 5Kd0T5NTxfYl5jFPrk+tVyimXDzBdiBvBGYGzBL4= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:09 +0100 (CET) X-EA-Auth: T+e8auSFOgW+XKfxBK4Jl+S9/0JDWMukDswyjEnFjm9nMjW6MD0ld6qMCtGRHV5FZ9UxzeDkWdyBtUbswZfpSf4WBicW+l2mYNCz7FGBGGU= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:55 +0300 Message-Id: <20220218191157.15429-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 4/6] fftools/cmdutils.c: Replace MAX_PATH-sized buffers with dynamically sized ones 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 42QB3Og6I4qT --- fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..ea78897 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -62,6 +62,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -2065,6 +2066,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + char *datadir = NULL; +#endif const char *base[3] = { getenv("FFMPEG_DATADIR"), getenv("HOME"), FFMPEG_DATADIR, }; @@ -2074,19 +2078,31 @@ FILE *get_preset_file(char *filename, size_t filename_size, f = fopen(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) - char datadir[MAX_PATH], *ls; + wchar_t *datadir_w = get_module_filename(NULL); base[2] = NULL; - if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) + if (wchartoansi(datadir_w, &datadir)) + datadir = NULL; + av_free(datadir_w); + + if (datadir) { - for (ls = datadir; ls < datadir + strlen(datadir); ls++) + char *ls; + for (ls = datadir; *ls; ls++) if (*ls == '\\') *ls = '/'; if (ls = strrchr(datadir, '/')) { - *ls = 0; - strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); - base[2] = datadir; + const int datadir_len = ls - datadir; + const int desired_size = datadir_len + strlen("/ffpresets") + 1; + char *new_datadir = av_realloc_array( + datadir, desired_size, sizeof *datadir); + if (new_datadir) { + datadir = new_datadir; + datadir[datadir_len] = 0; + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); + base[2] = datadir; + } } } #endif @@ -2106,6 +2122,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; } From patchwork Fri Feb 18 19:11:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213287nkx; Fri, 18 Feb 2022 11:12:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgc4GhCl4uT4Gr8LU8/K6xydoScdBapYgLzjaagMxz6mECVDaoKn1q8VF5o0xPkz5y73R8 X-Received: by 2002:a17:906:154c:b0:6ce:21d7:2826 with SMTP id c12-20020a170906154c00b006ce21d72826mr7450263ejd.9.1645211553183; Fri, 18 Feb 2022 11:12:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211553; cv=none; d=google.com; s=arc-20160816; b=tZyRCqM3z4UckmruwAt8X/aXYRwBigSJn46av8XOq+0bIdefwUwXYXAFPq0DIJ+lxH dPolYMNbYd75/LCbcuQ/QlkVKxt47IV1V+3QyOyah0ZBifuZcoukurJm9hc0X69FDX55 aHRhPcyEiK/QXbr92J9/3eAG0EFotB3sWJ5ylb0jZDgsJQQCVIHd3A51MYRWJIvIkv3q bYLD3hnTIVyge/kKQe/CLrlUQMWUqDqnW82sJq9XRemJIGd8FcPcX3S9PtZZH4RsBtZd q52Clu+hZplBHn5yTlTmejErV9hUBv78J7JPHa+Op4Rd2IyRwh1ns9Jz8hcI5uhw6tHl pgnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=esehhxBMiwKb0pz6OSnIK7akoVSOCdXkT7BjgUrmsDc=; b=mJ1FWGJhthLuXu6UKyLmClxF84Qz7g5ZWodkz8FGbU0Pnd2XvPpBPTa4E0SgejZWMc IcGTlszzCxLW2ofkuwxd2aZrsZm4DIr4JsGDu3EofmDwt5Db7RdyhMItqSdmjxvXdaml UwwbfCRQDVVOA72cR8oqYY69mW7xVocscWvpaH1flUY6b1yx1vi1FDIKJ5wWEeJe3ZQ9 +B1op5r6jtmyvnTVvzpFdJGb50qVbAdnr438umvlv21mdimLmLiNM/xp4RHcEmp4goNV kEXW/ljomdxf8bQcGMgIbBG+80HdwWRyh1NIu3OOWnzh8ReQmW7PC5sfobvzTeF7+37J vwgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="V2Bk/B79"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 13si4355861ejg.544.2022.02.18.11.12.32; Fri, 18 Feb 2022 11:12:33 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="V2Bk/B79"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E3C8680500; Fri, 18 Feb 2022 21:12:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC6A680500 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211530; bh=zFvXZWeWgPf+XX67XeHcVSogz9F7uLmqbfFMd8RFRzg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=V2Bk/B79cQVjifIsWEfhZPba3sIclyJdDGO4Pb/liqZhCvgm0e1MCldIhXfFjR26V EWOpoo87yI4ScYTlMAJFQaLd5zTaVh8Iray8XzmTdk66iwqGaNxHP0TmkaVIYoL1HJ nz43druTLoo7Ovjdu40N5WPXZCurnKiQOZzyjA2c= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:10 +0100 (CET) X-EA-Auth: CK8YoUXAqTYtorbmU6k+S+7XS7y5MZC776Yr61Rl0WqpvKVXzp1W7mInlcKCndcssdZDRMHrdGX0OkuvqCieEN8o/TiXKIMrSWJ99FUE+rQ= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:56 +0300 Message-Id: <20220218191157.15429-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 5/6] fftools: Enable long path support on Windows (fixes #8885) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: r8EtXiVQNilb --- fftools/Makefile | 5 +++++ fftools/fftools.manifest | 10 ++++++++++ fftools/manifest.rc | 3 +++ 3 files changed, 18 insertions(+) create mode 100644 fftools/fftools.manifest create mode 100644 fftools/manifest.rc diff --git a/fftools/Makefile b/fftools/Makefile index da42078..b221155 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -11,6 +11,11 @@ ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) OBJS-ffmpeg += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o +# Windows resource files +OBJS-ffmpeg-$(HAVE_GNU_WINDRES) += fftools/manifest.o +OBJS-ffplay-$(HAVE_GNU_WINDRES) += fftools/manifest.o +OBJS-ffprobe-$(HAVE_GNU_WINDRES) += fftools/manifest.o + define DOFFTOOL OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest new file mode 100644 index 0000000..30b7d8f --- /dev/null +++ b/fftools/fftools.manifest @@ -0,0 +1,10 @@ + + + + + + + true + + + diff --git a/fftools/manifest.rc b/fftools/manifest.rc new file mode 100644 index 0000000..e436fa7 --- /dev/null +++ b/fftools/manifest.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fftools.manifest" From patchwork Fri Feb 18 19:13:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213958nkx; Fri, 18 Feb 2022 11:13:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyWCXONBPDi8M4Zsguthg8T6L0QSXZrbmXzJXskW2WfTDjbfizUr3G/dsTAy4X4h+vPUlUu X-Received: by 2002:a05:6402:7cb:b0:410:dde2:5992 with SMTP id u11-20020a05640207cb00b00410dde25992mr9964913edy.323.1645211605136; Fri, 18 Feb 2022 11:13:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211605; cv=none; d=google.com; s=arc-20160816; b=lPMtdj5znQDCvhYExcNBdJ0v3wahZR9A9933tAXzXnCHs7d0L8wiJGqy39NhYvXMR8 IlrjMFS9SyKbJ9KCYia6iyRaQwTxpY0Z1d1DgWn5ti20DXgsH5nJw2rjHKHe/Qu96xGP RLYQZ0HEASmqE5J2va4nMmvwglIK0EQamrqnzBjuuICM+RZ8Seh/pfP6ggLjPE9DamKp i2LebjZWeYC66V5H+Jcj2m74sq5vK2AliC5XBkEMUQF5nbwI/vnud0uzH6yagrC1AIY0 KZvh9FRl7ehkU4lFYXI2IQHetu5KW5ER5TvpU2KjlshjuqrmxQQ+b4v9oZy1rAqKBxt/ w9pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=/3rgZVbNugh8FBdOu+38fml+gF9J/4917oLUnX9j0rM=; b=fNBWfTbHallORWlXfO00jjuIB1HbBnzn6KmccMJOr/xvPsPCUwi87jG82tmSP1qndV i7hNtTPeWiUG0oOr8FIzpgazaq+TnOxVLkWBcagcGRjVI0VEXA9Um1r21RY+fInkgY9G uloEw9KVvTjc79bVqDqC2A/d4ch0mkcFjO63AWlwLJxDEYMdAowa3T3f61GY38SQdA7n 369wOWYWczU72qODklI99uKuawIg6Boc9BAXCsstKJLldHByPGT54OnvkK6gjNp83p9w tRa9zGjzOr0H4CcPPPHNfa+ppOedXazc4wpBjZSde63/xmxZxg7GLBJNl9yJlB1Fa5WW DZoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=BPpQ4NTN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id et19si3659571ejc.842.2022.02.18.11.13.24; Fri, 18 Feb 2022 11:13:25 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=BPpQ4NTN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F32E680266; Fri, 18 Feb 2022 21:13:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E86E680266 for ; Fri, 18 Feb 2022 21:13:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211593; bh=arj4i+ZjicPkq0NlTR6GuXdrPs/J5vh3Iublebu6JY8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=BPpQ4NTNlkPSKY2IvjP+BeT7hh6VA9BHTOWeioTyIM1blGv61w4WoZmnykPekdF6H Q90AcU1he7JxgzWvRP0OkGIKdOmZ8dkwWwmzgsUytFKcsB+8MqTepSrL8bhAoNiqXP xMzqATzG9KfvWKTMt0XlqZb8Aw3fi9Lgb2f71G3Q= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:13:13 +0100 (CET) X-EA-Auth: 3sryt7GHWnSmxCjvfJew8L6ry35QGulvYd7AsRZBbXF01tbRSbf52yAvF6bqzNNQzhszX+61FsrUqNZ5/o93q7iLyg1e85w4H9OPNvb6s6U= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:13:04 +0300 Message-Id: <20220218191304.15496-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 6/6] fftools: Use UTF-8 on Windows 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 67qrD41IANZE --- fftools/fftools.manifest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest index 30b7d8f..d1ac1e4 100644 --- a/fftools/fftools.manifest +++ b/fftools/fftools.manifest @@ -3,8 +3,10 @@ - + true + UTF-8