diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-28 06:24:17 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-28 10:59:31 +0200 |
| commit | 4454142782bd3db769939e63ea0f2e5e917dc29d (patch) | |
| tree | 4ddb97e804ad61be39f981f22c28ab806d9bad83 | |
| parent | c471cc74747461ca166559c7b7fdfe030c3e3712 (diff) | |
| download | ffmpeg-4454142782bd3db769939e63ea0f2e5e917dc29d.tar.gz | |
avutil/wchar_filename: Make the header C++ compatible
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ö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavutil/wchar_filename.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |