Merge commit '960aff379da46dcaff61504a57714d4d4e758e41'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 01:52:54 +0000 (02:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 01:52:54 +0000 (02:52 +0100)
commitecfafc5f2b632780dd310def1d6b3a2c10565465
tree3a87ca7ab687afe953c778b0503af3393969ecb0
parent71ecfcf2d31e4f906f52c3450f4fb46c5087f50e
parent960aff379da46dcaff61504a57714d4d4e758e41
Merge commit '960aff379da46dcaff61504a57714d4d4e758e41'

* commit '960aff379da46dcaff61504a57714d4d4e758e41':
  lavf: Use wchar functions for filenames on windows for mkdir/rmdir/rename/unlink

Conflicts:
libavformat/os_support.h

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