diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:10:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:10:43 +0100 |
| commit | ecf16f039def26e028a4413ea94a32166e351a46 (patch) | |
| tree | a732b1e457c9e5e3c64216c69c5c28d0fea35782 /libavcodec/pnm_parser.c | |
| parent | 4b50de88a4c07143cff1030fe740ac4352c3632c (diff) | |
| parent | 7d7be44f3e8bc14224540a477ef0607f18964421 (diff) | |
| download | ffmpeg-ecf16f039def26e028a4413ea94a32166e351a46.tar.gz | |
Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421'
* commit '7d7be44f3e8bc14224540a477ef0607f18964421':
build: Drop stray PNG decoder dependency on dsputil
Conflicts:
configure
No change as the stray dependency was not in our configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions