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)
* commit '4e629ef80e62a54636cb46033998177dd08cf3ad':
  http: Fix authentication, broken since 6a463e7fb

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

Simple merge