diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:12 +0100 |
| commit | 034a1afbd85ee18c1b7f3b9be59371173d421c6b (patch) | |
| tree | 7095b4cf27ffb4e43d00bf9e56d4c0c91216f3f7 /libavresample/audio_convert.c | |
| parent | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (diff) | |
| parent | 15816c8e8bd5ab2f027824ea5122d7901633634a (diff) | |
| download | ffmpeg-034a1afbd85ee18c1b7f3b9be59371173d421c6b.tar.gz | |
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>
Diffstat (limited to 'libavresample/audio_convert.c')
0 files changed, 0 insertions, 0 deletions