[FFmpeg-cvslog] Merge https://github.com/lukaszmluki/ffmpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 18 01:40:37 2013 +0200| [1816f5509e4f0fd55d32b5dbf70c3be21c1b1515] | committer: Michael Niedermayer

Merge https://github.com/lukaszmluki/ffmpeg

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1816f5509e4f0fd55d32b5dbf70c3be21c1b1515
---