diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:35:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:35:38 +0100 |
| commit | a12b4bd107cf028e44cab8dafca61a866cecd252 (patch) | |
| tree | f1256dfb35b4dc17d35b6d0a9453ec96f8fe35f3 /doc/print_options.c | |
| parent | 6f24566f56b8ed0424a77aede46bb3ddf06a28c8 (diff) | |
| parent | 92f0abb27fe26efdf33bec51d1f583e46036ac74 (diff) | |
| download | ffmpeg-a12b4bd107cf028e44cab8dafca61a866cecd252.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Check for pod2man instead of perl for manual page generation
Conflicts:
configure
doc/Makefile
The code that this changes is mostly not part of ffmpeg
thus only a few whitespaces end up being merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
0 files changed, 0 insertions, 0 deletions