diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 2d8a90346a..4ae5ac1bf0 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -27,46 +27,6 @@ #include "avformat.h" #include "os_support.h" -#if defined(_WIN32) && !defined(__MINGW32CE__) -#undef open -#undef lseek -#undef stat -#undef fstat -#include -#include -#include -#include -#include - -int ff_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; - return -1; - } - MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars); - - fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode); - av_freep(&filename_w); - - if (fd != -1 || (oflag & O_CREAT)) - return fd; - -fallback: - /* filename may be be in CP_ACP */ - return _sopen(filename_utf8, oflag, SH_DENYNO, pmode); -} -#endif - #if CONFIG_NETWORK #include #if !HAVE_POLL_H diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 39d4cb6519..ae8cef7efa 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -77,11 +77,6 @@ static inline int is_dos_path(const char *path) #endif #endif -#if defined(_WIN32) && !defined(__MINGW32CE__) -int ff_win32_open(const char *filename, int oflag, int pmode); -#define open ff_win32_open -#endif - #if CONFIG_NETWORK #if !HAVE_SOCKLEN_T typedef int socklen_t; diff --git a/libavutil/file.c b/libavutil/file.c index 9ce0dc5e01..cf76a8ac82 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -36,6 +36,45 @@ #include #endif +#if defined(_WIN32) && !defined(__MINGW32CE__) +#undef open +#undef lseek +#undef stat +#undef fstat +#include +#include +#include + +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; + return -1; + } + MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars); + + fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode); + av_freep(&filename_w); + + if (fd != -1 || (oflag & O_CREAT)) + return fd; + +fallback: + /* filename may be be in CP_ACP */ + return _sopen(filename_utf8, oflag, SH_DENYNO, pmode); +} +#define open win32_open +#endif + int avpriv_open(const char *filename, int flags, ...) { int fd;