Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jul 2014 00:19:04 +0000 (02:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jul 2014 00:19:07 +0000 (02:19 +0200)
* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

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

Trivial merge