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)
commit1816f5509e4f0fd55d32b5dbf70c3be21c1b1515
tree75ed13ca697c0a7ac8031726d1138d50c77c9e58
parent37ded53037196144eb712daa5decaca7f92ae3c6
parent816c579cf3cbd079c1b14aaa063b61eed4c555ad
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@gmx.at>