ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 25 17:07:02 2014 +0100| [d0879a93eac6ffe052e08e435141f1ae5366c4d3] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0879a93eac6ffe052e08e435141f1ae5366c4d3 --- libavformat/os_support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 256890b..17e362b 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
