[FFmpeg-cvslog] avutil/wchar_filename: Make the header C++ compatible

Andreas Rheinhardt git at videolan.org
Tue Jun 28 12:22:18 EEST 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Jun 28 06:24:17 2022 +0200| [4454142782bd3db769939e63ea0f2e5e917dc29d] | committer: Andreas Rheinhardt

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 at martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4454142782bd3db769939e63ea0f2e5e917dc29d
---

 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;



More information about the ffmpeg-cvslog mailing list