[FFmpeg-cvslog] avutil/wchar_filename: re-introduce explicit cast of void* to char*

Marton Balint git at videolan.org
Sun Oct 27 11:19:34 EET 2024


ffmpeg | branch: release/6.1 | Marton Balint <cus at passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [4d40898657659f8251a351af3f1f2a93584ccd58] | committer: Marton Balint

avutil/wchar_filename: re-introduce explicit cast of void* to char*

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 <cus at passwd.hu>
(cherry picked from commit 9b0128aa766221f8a32e13cf3c1d3e6d75a2d829)

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

 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;



More information about the ffmpeg-cvslog mailing list