Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'

* 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>

diff --cc libavformat/os_support.h
Simple merge

diff --cc libavutil/file_open.c
Simple merge

diff --cc libavutil/wchar_filename.h
index 0000000,2781773..c553c46
mode 000000,100644..100644
--- /dev/null
--- 2/libavutil/wchar_filename.h
+++ b/libavutil/wchar_filename.h
@@@ -1,0 -1,44 +1,44 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 -    *filename_w = av_mallocz(sizeof(wchar_t) * num_chars);
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVUTIL_WCHAR_FILENAME_H
+ #define AVUTIL_WCHAR_FILENAME_H
+ 
+ #if defined(_WIN32) && !defined(__MINGW32CE__)
+ #include <windows.h>
+ #include "mem.h"
+ 
+ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w)
+ {
+     int num_chars;
+     num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0);
+     if (num_chars <= 0) {
+         *filename_w = NULL;
+         return 0;
+     }
++    *filename_w = (wchar_t *)av_mallocz_array(num_chars, sizeof(wchar_t));
+     if (!*filename_w) {
+         errno = ENOMEM;
+         return -1;
+     }
+     MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, *filename_w, num_chars);
+     return 0;
+ }
+ #endif
+ 
+ #endif /* AVUTIL_WCHAR_FILENAME_H */