virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'

Browse Source 
* commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132':
  file: Move win32 utf8->wchar open wrapper to libavutil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-09 07:16:31 +02:00
commit 0dc17da308
3 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavformat/os_support.c
View File

@ -27,46 +27,6 @@
#include "avformat.h" #include "avformat.h"
#include "os_support.h" #include "os_support.h"
#if defined(_WIN32) && !defined(__MINGW32CE__)
#undef open
#undef lseek
#undef stat
#undef fstat
#include <fcntl.h>
#include <io.h>
#include <windows.h>
#include <share.h>
#include <errno.h>
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 #if CONFIG_NETWORK
#include <fcntl.h> #include <fcntl.h>
#if !HAVE_POLL_H #if !HAVE_POLL_H

5
libavformat/os_support.h
View File

@ -86,11 +86,6 @@ static inline int is_dos_path(const char *path)
#endif #endif
#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 CONFIG_NETWORK
#if !HAVE_SOCKLEN_T #if !HAVE_SOCKLEN_T
typedef int socklen_t; typedef int socklen_t;

39
libavutil/file.c
View File

@ -36,6 +36,45 @@
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(_WIN32) && !defined(__MINGW32CE__)
#undef open
#undef lseek
#undef stat
#undef fstat
#include <windows.h>
#include <share.h>
#include <errno.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;
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 avpriv_open(const char *filename, int flags, ...)
{ {
int fd; int fd;