aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-25 17:07:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-25 17:07:02 +0100
commitd0879a93eac6ffe052e08e435141f1ae5366c4d3 (patch)
tree069c4d7959b0fcc91d89b959f6f5bd1e4d951342
parent8cd80b5fcbfaefdb92faa8f3ed0b7f5651f38481 (diff)
downloadffmpeg-d0879a93eac6ffe052e08e435141f1ae5366c4d3.tar.gz
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 <michaelni@gmx.at>
-rw-r--r--libavformat/os_support.h2
1 files changed, 1 insertions, 1 deletions
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;