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

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

[Andreas Rheinhardt]

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 <andreas.rheinhardt@outlook.com>
---
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;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avutil/wchar_filename: Make the header C++ compatible

[Martin Storsjö]

On Tue, 28 Jun 2022, Andreas Rheinhardt wrote:

> 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 <andreas.rheinhardt@outlook.com>
> ---
> 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;
> -- 
> 2.34.1

LGTM, thanks!

// Martin

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".