From patchwork Tue Oct 22 17:57:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 52448 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8dc2:0:b0:48e:c0f8:d0de with SMTP id j2csp82395vqs; Tue, 22 Oct 2024 11:04:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVLABAtmOKmXG7B/BYBtqVWAx0nvAU1xwni9v0uGtdmpni+oA4Rp/gLzzmgFHPc2vhUYCgX1ZbRreruRqx/Zn1@gmail.com X-Google-Smtp-Source: AGHT+IGt4fOF6BH45FLg9hnbSFDrEP3mJqX0wDFBxOLkmBhU7o7vQ3JFw70pNsmU6OEAuyfaTj6r X-Received: by 2002:a05:6402:4311:b0:5c9:547d:99 with SMTP id 4fb4d7f45d1cf-5cb8ac49231mr75978a12.2.1729620251922; Tue, 22 Oct 2024 11:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729620251; cv=none; d=google.com; s=arc-20240605; b=gOdYf9zCS1VNxwvMhikuWoeEml2PP6BAiYynnM0IcZjbKCYaXZHXnfnCt5MQKgbH/F jgEmlDxIJtNz7lDANRBL9RBsYj9ndNy0YeiMBdYM1KYHGhDO0LRCo6t06SFAqJAPsUZ2 f7g7H1f5q7hcwZoszdrqAf/v0OeWWWAp6+gtonz4ZPSu6OSs5isnNCAaUchvH4VFWstK S5+MHf9HCEs5OWa7nqYrqJDlG0rJMkdbp5FLcZudQTX1Muor/6bn0onzGcqehp8C9Hn5 HtEUsj6que4iELyy7L4bcJNKP4ci1YmTkiqee/jBaG9HvkEdyRo15W8jaLZwKI3PcDRq n70w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=OYPjAyCSyXlxhCMkUCBEvvTu0pMnzm6Y92/eY8s/VFg=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=YTvpn7eXDMxoFQpDtkSXRnQjIQBzdzDdEaqVvI3oyguua+vXupZv+LtZvTOf4Z97SY n4guAyjk+3IkUiv8l+BhRHOBS8hoYHY+5WU6oJ5W64m4dQBG0EtSKRL0KCm6MI6LQTkV PDeGLNyhB+umbwDzUu9a7e7ZEMIKNCzOaKD304kYX0ovowpm/riiO/9K5lg5sAXolZgh QhgnlMyIdEyBFdUvxe+Y99IWDiDOhS+LQrjUeVCVLq74WAubMUnHUe3j1I3wthozKEJD 66krh4ML1dHs5MtSsxIZ0QwmpXaGNKQc+POm0z6f/CX4eOmUe8DYXIFrWf3X/sSJGKZJ JXmQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5cb6696d3fdsi4425589a12.14.2024.10.22.11.04.11; Tue, 22 Oct 2024 11:04:11 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C87F968DE5A; Tue, 22 Oct 2024 20:57:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BD2168CFEA for ; Tue, 22 Oct 2024 20:57:36 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B8A03EB054; Tue, 22 Oct 2024 19:57:35 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k2CtVGjATHxx; Tue, 22 Oct 2024 19:57:34 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 31CDEEB04D; Tue, 22 Oct 2024 19:57:34 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 19:57:22 +0200 Message-ID: <20241022175727.31960-1-cus@passwd.hu> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/wchar_filename: re-introduce explicit cast of void* to char* 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hTKfJceYglqh Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 23cc92aa2d..1370a084c9 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -57,7 +57,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;