Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:10:26 +0000 (11:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:10:26 +0000 (11:10 +0100)
commit097de4d1d68fb5aef5fc8881b2afc65db3f0dac0
treedc90f37eeb1d3843fddb2c0eb4c73a46c4a19046
parent9f9440bd8122cc8798139c9370db0873a24ae14b
parent9326d64ed1baadd7af60df6bbcc59cf1fefede48
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>
libavformat/os_support.h
libavutil/file_open.c
libavutil/wchar_filename.h