diff options
Diffstat (limited to 'libavutil/file_open.c')
-rw-r--r-- | libavutil/file_open.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 765eb60ef3..f14ea70862 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -37,23 +37,18 @@ #include <windows.h> #include <share.h> #include <errno.h> +#include "wchar_filename.h" static int win32_open(const char *filename_utf8, int oflag, int pmode) { int fd; - int num_chars; wchar_t *filename_w; /* convert UTF-8 to wide chars */ - num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0); - if (num_chars <= 0) - goto fallback; - filename_w = av_mallocz(sizeof(wchar_t) * num_chars); - if (!filename_w) { - errno = ENOMEM; + if (utf8towchar(filename_utf8, &filename_w)) return -1; - } - MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars); + if (!filename_w) + goto fallback; fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode); av_freep(&filename_w); |