Merge commit '4e629ef80e62a54636cb46033998177dd08cf3ad'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:11:16 +0000 (00:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:12:56 +0000 (00:12 +0200)
commite260c8180ec6c6a6258d2aa4fd19b43f8e79de3f
tree1a2d70227c726c8e52c29b4412cfe7e01b898c6e
parenta8db787932ad71ac4f77b61357b695c3b35a283d
parent4e629ef80e62a54636cb46033998177dd08cf3ad
Merge commit '4e629ef80e62a54636cb46033998177dd08cf3ad'

* commit '4e629ef80e62a54636cb46033998177dd08cf3ad':
  http: Fix authentication, broken since 6a463e7fb

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