diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 01:51:14 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 15:38:52 +0100 |
commit | 85cabf1ca98fcc502fcf5b8d6bfb6d8061c2caef (patch) | |
tree | 5cac6c8fcca90badb397dd816513491eebf5929c /libavutil | |
parent | d0ac60730d26f1d59817c675806ed199abbef906 (diff) | |
download | ffmpeg-streaming-85cabf1ca98fcc502fcf5b8d6bfb6d8061c2caef.zip ffmpeg-streaming-85cabf1ca98fcc502fcf5b8d6bfb6d8061c2caef.tar.gz |
avutil: add av_fopen_utf8()
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/avutil.h | 7 | ||||
-rw-r--r-- | libavutil/file_open.c | 34 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 42 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4692c00..4e680ed 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -313,6 +313,13 @@ unsigned av_int_list_length_for_size(unsigned elsize, av_int_list_length_for_size(sizeof(*(list)), list, term) /** + * Open a file using a UTF-8 filename. + * The API of this function matches POSIX fopen(), errors are returned through + * errno. + */ +FILE *av_fopen_utf8(const char *path, const char *mode); + +/** * @} * @} */ diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 389076f..bcdd26a 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -93,3 +93,37 @@ int avpriv_open(const char *filename, int flags, ...) return fd; } + +FILE *av_fopen_utf8(const char *path, const char *mode) +{ + int fd; + int access; + const char *m = mode; + + switch (*m++) { + case 'r': access = O_RDONLY; break; + case 'w': access = O_CREAT|O_WRONLY|O_TRUNC; break; + case 'a': access = O_CREAT|O_WRONLY|O_APPEND; break; + default : + errno = EINVAL; + return NULL; + } + while (*m) { + if (*m == '+') { + access &= ~(O_RDONLY | O_WRONLY); + access |= O_RDWR; + } else if (*m == 'b') { +#ifdef O_BINARY + access |= O_BINARY; +#endif + } else if (*m) { + errno = EINVAL; + return NULL; + } + m++; + } + fd = avpriv_open(path, access, 0666); + if (fd == -1) + return NULL; + return fdopen(fd, mode); +} diff --git a/libavutil/version.h b/libavutil/version.h index c3de379..abd5362 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 49 +#define LIBAVUTIL_VERSION_MINOR 50 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |