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)
commit7d179b126b95c5659cf3b4681d72b6cde4e1a57a
treecb50c3144403cd6fe65d33d034fc46c761c1c88e
parent9937362c54be085e75c90c55dad443329be59e69
parentc82521713d1f1ad2e1aae5f5aa968cb14899997a
Merge remote-tracking branch 'lukaszmluki/master'

* 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>