diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-30 18:17:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-30 18:18:20 +0100 |
| commit | 79440651149c89fba9ef5563c9b8a4b3a59acdf5 (patch) | |
| tree | ebd4c4a4a029d1e922933cc99e039211e5fc62be /libavresample/audio_mix.c | |
| parent | 4c592c39087a15e2b37aa46956775b7fa869fa57 (diff) | |
| parent | 0f257e29c5520b215e573e7e3abde8e5a4743309 (diff) | |
| download | ffmpeg-79440651149c89fba9ef5563c9b8a4b3a59acdf5.tar.gz | |
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions