From d0879a93eac6ffe052e08e435141f1ae5366c4d3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 Nov 2014 17:07:02 +0100 Subject: avformat/os_support: try to fix build when included from a c++ file like libavdevice/decklink*cpp Found-by: Zeranoe Signed-off-by: Michael Niedermayer --- libavformat/os_support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/os_support.h') diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 256890b2b9..17e362b8b2 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -154,7 +154,7 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) *filename_w = NULL; return 0; } - *filename_w = av_mallocz(sizeof(wchar_t) * num_chars); + *filename_w = (wchar_t *)av_mallocz(sizeof(wchar_t) * num_chars); if (!*filename_w) { errno = ENOMEM; return -1; -- cgit v1.2.3