diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:11:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:12:11 +0200 |
| commit | 46ad2d9e446304e00f44760da5abd66f5117b4fa (patch) | |
| tree | f41cbe98d569fc5801aef45ec87ef5541c22515c /libavcodec/pnm_parser.c | |
| parent | 5dc2c99055ae4a95336f28c58c8c8da4033979f1 (diff) | |
| parent | 03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (diff) | |
| download | ffmpeg-46ad2d9e446304e00f44760da5abd66f5117b4fa.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions