From dfc6b5c81491abf7effb97b23af17ccf7adcd132 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Thu, 8 Aug 2013 11:29:57 +0300 Subject: file: Move win32 utf8->wchar open wrapper to libavutil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When libavformat was changed to use the new avpriv_open function in 51eb213d001, this silently bypassed the existing wrapper for win32. Move the win32 wrapper into libavutil/file.c to make sure it gets called everywhere (not just in the libavformat case). This makes sure that non-ascii file names gets opened properly (where file names internally are stored as utf8, but they get converted to wchar_t and opened with _wsopen). Signed-off-by: Martin Storsjö --- libavformat/os_support.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libavformat/os_support.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; -- cgit v1.2.3