-
Michael Niedermayer authored
* commit '9326d64e': 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>
097de4d1
* commit '9326d64e': 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>