Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Oct 2013 07:34:27 +0000 (09:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Oct 2013 07:34:27 +0000 (09:34 +0200)
* qatar/master:
  http: Check the auth string contents and not only the pointer

Conflicts:
libavformat/http.c

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

Simple merge