From patchwork Tue Jun 28 04:31:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2422926pzh; Mon, 27 Jun 2022 21:31:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scTj9fWAqj8Vp7DQRxn+hb+LgUZDvxS6fc5znzfFh3kU1tHguxkKxzH5F6w5nyiYLtVXlV X-Received: by 2002:a17:907:72d6:b0:722:e59a:72f4 with SMTP id du22-20020a17090772d600b00722e59a72f4mr16136134ejc.158.1656390700301; Mon, 27 Jun 2022 21:31:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y10-20020a056402440a00b00437b04e3a9esi225234eda.105.2022.06.27.21.31.35; Mon, 27 Jun 2022 21:31:40 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=WCWSwJUf; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF05E68B8ED; Tue, 28 Jun 2022 07:31:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068062.outbound.protection.outlook.com [40.92.68.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C747168B6F5 for ; Tue, 28 Jun 2022 07:31:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fW4Q0k+cRgQeqmJ5Nx9N9tJvbfk8OYSzuizpWcULqGQpVpK8il5R/fIoH8ACYugdCfv3QfKgZJl/tWo9XShFydXkxjmkl8Dn+hOV+J5CNFyZwgoBSNlnILNq+caAOyE0iPHhavwGkLiEEsuMNcmjXZ4TQNdKAihlRAde5KPPTsQIEGLH3Uw0ckiWeGGLiPcYC3zFndJR1sKpZty4NzfXPTFT543ItVMGL5s32Dsj0aEAzNl5xTn3M5cbo5Og+9MkVt6VHb0daVEmZi0ZAk5k8rEkfbUhKaEDJLVTi5f3Wz7ve/S++WAS53OPVHiQXi3Q7E6dedSM4REYzz+EUF7Vqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hll7aoHMH6tIpoVxNqByZCw9CXrI+pt4uHVLKuhfWeA=; b=IIlRSHkidLJBreey9yq8gHf31ShvK+7rbimLFXCqlpe/4guZ6qaef7D2TlpxnVKMw9YEi/vuzt0n1cLcCQbVPN0h+2pUsm29Am+Qnt/fjukhzJNH+SE9vReN9JMB2pilgzaTGQlmlL5R4sd555BYz7IeQMnMyKW88IPpkLNGm8BeYkXut30U2PRCn0YJD/m2yGgp2M1GmpQbW+CdAXSx+XD4Yr6OhIafCjkYq/y5H1nTqT26eHhTElaCxvh9uIGJj9l/il4NCdXoS7jTiiYGln6nY1afv802UCGMROf+OmH4blQqyGhBDxCJQGLa0e6RuNfTovDrZdCHAxaq6x9mrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hll7aoHMH6tIpoVxNqByZCw9CXrI+pt4uHVLKuhfWeA=; b=WCWSwJUf6nOLzEjP8AhNMmcyoo8Qc3sN/D9r5/tJmVssfxZWKcee/42A0V6qjgfuhUtyUrqXf32gxAaIcTJTT6Zrd5apmslJT+/dUEMOjYzyvLeHox1y0WT3O9mL1JgZFvp+0RKYXe5AVN+EgKN2aLU+/ljQTS2dnmKr/dXKpBzFw5adq5JAz+q77tmsdnII5FZ7fLEGGHnSBKWvHMv9YR4Kn5YJyLCOt5nGV+QqPGOh7Wnsj8LI2WyqZ3maEOlDW90qhM4HbOzJ25Jps9kGDvVJavKb+E74ingEG+pZt3XXJ15Yc3pmKm0U3YGuRnWHOf6Q1cyXS1gi8cHSTF3LnA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB3084.eurprd01.prod.exchangelabs.com (2603:10a6:7:7e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Tue, 28 Jun 2022 04:31:23 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 04:31:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jun 2022 06:31:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [zQBMP+OoFRjE3amfNissK35nMlXzC6NI] X-ClientProxiedBy: AM6PR10CA0002.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220628043114.413065-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1b03747-c563-4fb9-fbf2-08da58bf0e64 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQhn5yLDXsDpPf/u8Qgo44ynT2xdpDKYzv46c015tA8eHF2ZJmaxWG/eOKvGEsiC1sHERbAtrQkIb6zBH3sPh+PZyQI2Hk+n+Dsr+b61YGL5KuK5IeN8sVzkivDJugG3OsWTpshoKUxhTKs113AG0ZETG5XPFlZbTJNv/rengT4SEWX+u7WQxZLltx5i4shDJO7VfViUjaKFKKsrB8DVr0Lcvq3TNG4leXtSOq+4cYzbGZfDTzUwTN9vVzViuRQCyYZmyy0mDvMoBbxCgpgKJp2M7ZapV3FAZxPo5dcLwYQmhNylGFYxIchRt6gkVP4J4EgjsXqiqZ5Q17H5GOQotcDPgO5dwHCnwDr9TChZ5eobC8lz9gCs3YvnTrsFulMaDFJ8myPNDobm3YySU53EMuKlf43LwTtGPmN2AtJ6FCYP5ih7TD5BL/ZBBoTdMuZq/EueRl3tWBmelGXL3CB7hFBNaAA2FDbbXLw9WupDS1e9QqOXq7lpfOywhbuebDHWy3Zp9aDoH0Tmjyv5UTe4V8B8jRCRPRXrhhwMwYI+5Xn+pny+d3SeU28VX6ktevq+BPXA9eJunhlDdJ0VpfM0TOn+UEphq6jaFVHy/yrQuio+ziLEYzhOk+c60fljoyNVgIvDgZLgT5ofwyJue8kmXjIARRCKKZ0IA5DR/ypp9q7l6COUR4TB/Edftu4qGucrz5h0l51k/CQD11AOTzKzsv4JoLRYqcMvNnoi8Ia9kwS8ZY8Ck2HrLdW8yco3PnSL1A= X-MS-TrafficTypeDiagnostic: HE1PR0102MB3084:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gGHbBx67Mwvz3cBADbKeY0qaZFQQ79arDMTU4I+1OtsVoGN9FITNXAM4ZCgUUH/FkvYs7ffQ903kUwKl1BGV/U+hsCvMm6DNTnztXVtgfoQiiJRttR50BGIqIxoD9GldhqgGIc1rxNw42gsXVZJ8tzJawdtI++q0aI0BJ2aPkme80fJa+jm8LG1qtCcB23cjvFc6oIFS1BqwAZrgRRXMsUeKwl0yUcFQptg6Xp5uPVw3M8xjns9CaVx5ccohnsevE3sV9zt4dumxFBW9/DLX/AyCWUwddaj1Jn2numdZZ0JX4znImmxtRqi2/JMQTWMHhQDH4m4TG89oum7vpP7HuC7QCZ4l4EcpEAItsJCYvQHrkI0vvjML56TIJCxk4fWH7K7pa3nzuUW60p/WZo0aizxRQoH7Akg5ExmdDV/m/A9zEaad6XAH7dm22w4NMhFEXmoNrJatLTaH5XA7uONGHKW5cbIWwjsNMPz5HzwDFAWNXc/QMHE5nfqVDyqo1aGzIY8lRz57ZN1xnRXRBH6lEi1RNX6sO8wCQgfuwP6+cGOQxZBbRrI6FAg1g5twf4taJzk/CYTAjXpX2O67z3kcfK1LsLCMcLN8QqSzuu97AwkD0EeAg6xudSDifLgz0Fij X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ysEuEg3/CdWZAQVcv2JJQ8LEGX6tC8Qmn/cDscOxhMHo/wplzN+VxedWOJNaw+UlAPYYhb2nYyMFc+kQUQ6mmKbdvomQtplu+2PkTUBmfDnOgwn7+Ad9EHnVVYfvNPk664XejWIkfk79eIj126riwikfxJmt3H2yCoOad0UXAa3UdDFxDVB7FqGoxz6BDLHida6c0h3iwc0br0Phe4aiM8IRm9qq0u1IsP+pCNJYbt4mmImP5xelP/AEgS/gJyN+94Gl6geJxVDkdLxEWonbYSc8iqfZJZ2AXf690XBqojTtUJfUsYkDmjYVS9osuG7FDngqGtsmzWIvO1V0xDuE21GT1ahPcgao4J5WTYUgRBxJWVwFYl7v5flMDkG0M9njXdGMsHrIoq1xFAKKWa3yiPgDNguTuXkygtI83adGsR10zRk8c6TddKkVPwtYZSsHWSZSAMbrMbdyQar1/duFw+fTurkhKzsicudgu9yPxw+nqFbywhhJobz9G/HZ8sgWN3P2os/+ndFIqu8PjRZYHVhsKg2ZmEQrEucbHtNmVmPs20VtdhkML4RsQGrGQ/FXY8KD4NdRMgo0GcqaxzUksFVOftotIQrgRhQedpFWEJIhJahL8G97eOBpPpBPqKWSDiFyw2cPmV8pLcYR/Uk5qXr/7DD5vCoZa6sgzszkbxJNnBLPf4FvWN6VCLW0NDZIXbjoRcHuHOqLUpU2L5SIKqGlxNdsXurdxgCDBhHliXgG9fZqM+xj/n79Py3tBMlTJDr5Mc6zVVt3gqWd3/E8ehmfP7656Ta6DtPkrYZB/Ei7/WCHmxf4QLVqkAKHnLtJJA5bgS4CKf36HroZHOiTid4IyuivPTsCqf9Lqxl4dTe+0qJawvK1PNibAPlhdO4jfzFVUfdDPI85lrH6vGm1pDsErMYHCm345dzTq99dnZMjmH+1r1hxnOII0u44z6ibHAyRJEnxWOIVfLqGR99kKONqOu7djE9LOzCcSFwgckHYlHA2MIdTJHgsy3PQh4/4eUCT66JZTVqtTp4NitaJ5DQSisl3r3WpruwNznWOa2JdbWPY+8awm47KE6X1jXoI6QSN/7cFCWnn3tz6cUMpwSaSvOeEgoMSBcScu758ttz7rXlTtKuLAfDQ2gZvW5QiraqvTq2ixRZC6lKZ5HR3LcUQhUfmjIqNbguZyiKjNmlw6XFXnOFxU9vSmZ5NKzpD6VMmE/JxzbW8MP+yrCJ6aHfutEiWUV9mNyCPV73PYDcdxfd45OGebKuLuRdCT603UajwlkuF1+oLJlsJE9GKw7feLZpJ444nYxFkovpuTwc= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1b03747-c563-4fb9-fbf2-08da58bf0e64 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 04:31:23.3436 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0102MB3084 Subject: [FFmpeg-devel] [PATCH] avutil/wchar_filename: Make the header C++ compatible 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7Gty1dxYq7mo When compiling decklink, this header is included from a C++ file (albeit inside 'extern "C"') and this causes compilation failures because of an implicit void* -> char* conversion. So add an explicit cast. Should fix ticket #9819. Signed-off-by: Andreas Rheinhardt --- If we didn't include os_support.h in lots of places via lavf/internal.h, this issue wouldn't exist. 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 08de073ed7..9a04a069f1 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -54,7 +54,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, *filename = NULL; return 0; } - *filename = av_malloc_array(num_chars, sizeof *filename); + *filename = (char*)av_malloc_array(num_chars, sizeof *filename); if (!*filename) { errno = ENOMEM; return -1;