Merge https://github.com/lukaszmluki/ffmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Jul 2013 23:40:37 +0000 (01:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Jul 2013 23:40:49 +0000 (01:40 +0200)
* https://github.com/lukaszmluki/ffmpeg:
  ftp: warning about pure-ftp server used as and output
  ftp: comments
  ftp: remove unused headers
  ftp: fix interrupt callback misuse

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge