diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 01:52:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:09:16 +0100 |
| commit | 875f9aea3ea0614061e03363cf832f9047a683c9 (patch) | |
| tree | 9b00c7245418c35d6a9e8a3ffb5013ea540619ad /libavcodec/pnm_parser.c | |
| parent | 6d9dad6a7cb5d544d540abf941fedbd34c14d2bd (diff) | |
| parent | dc80e2f7a529d6e4416b40b68699be16fed62d6c (diff) | |
| download | ffmpeg-875f9aea3ea0614061e03363cf832f9047a683c9.tar.gz | |
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
Makefile: Fix building programs on systems with a nonempty executable suffix
Conflicts:
Makefile
See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions