highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'

Browse Source 
* commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48':
  Share the utf8 to wchar conversion routine between lavf and lavu

Conflicts:
	libavformat/os_support.h
	libavutil/file_open.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-27 11:10:26 +01:00
parent 9f9440bd81 9326d64ed1
commit 097de4d1d6
3 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/file_open.c
View File

@@ -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_array(num_chars, sizeof(wchar_t));
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);