From 4454142782bd3db769939e63ea0f2e5e917dc29d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 28 Jun 2022 06:24:17 +0200 Subject: avutil/wchar_filename: Make the header C++ compatible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Fixes ticket #9819. Reviewed-by: Martin Storsjö Signed-off-by: Andreas Rheinhardt --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavutil/wchar_filename.h') 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; -- cgit v1.2.3