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)
commit0a6ce255ab49094e90aa5c7c76c46e0dccd5708d
tree75012f382b7366717939f22aec355e30adc138f0
parentc35d29a9c8240b81f8b7e089356b30bb26f034b9
parent708b32b6f72c58ec1bf5fed6a227b3e48b971a05
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Check the auth string contents and not only the pointer

Conflicts:
libavformat/http.c

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