Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:35:38 +0000 (02:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:35:38 +0000 (02:35 +0100)
commita12b4bd107cf028e44cab8dafca61a866cecd252
treef1256dfb35b4dc17d35b6d0a9453ec96f8fe35f3
parent6f24566f56b8ed0424a77aede46bb3ddf06a28c8
parent92f0abb27fe26efdf33bec51d1f583e46036ac74
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>
configure