Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Nov 2012 13:55:04 +0000 (14:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Nov 2012 13:55:12 +0000 (14:55 +0100)
commit034a1afbd85ee18c1b7f3b9be59371173d421c6b
tree7095b4cf27ffb4e43d00bf9e56d4c0c91216f3f7
parentdb29a7c7c2822a2f2e9804988e279a9fe7d88c11
parent15816c8e8bd5ab2f027824ea5122d7901633634a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Include io.h with a separate condition from MapViewOfFile
  cmdutils: Use a configure check for enabling CommandLineToArgvW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
configure
libavutil/file.c