Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:33:27 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:34:02 +0000 (02:34 +0100)
commit03fd80dcb1f8885385bcd04aa59a2931db5316d3
tree877ebeb520afd0563601e496cc904e2c7e7292a2
parent3a05d7a9e583b8f5fee361d97d6793cf01974af2
parent55a215ba63d9fa79cd7ee265ee2e777ee86b200c
Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'

* commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c':
  http: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c