Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Aug 2013 05:16:31 +0000 (07:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Aug 2013 05:16:38 +0000 (07:16 +0200)
commit0dc17da30825c9bda5afef646ef3494fecce646a
tree791efd68a827963ba87ac86f0d257e852d073bd8
parent18be3fac1d04e02bace8fe6e6375b6d14f411514
parentdfc6b5c81491abf7effb97b23af17ccf7adcd132
Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/os_support.c
libavformat/os_support.h
libavutil/file.c