Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 22:22:37 +0000 (23:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 22:24:19 +0000 (23:24 +0100)
commit11ed7ec092d33511376cffdcb232bfd1f3f56dd7
treee992800a317f90d7cd1099d929e8cb8f01a57d3d
parentb5c6b23acd6f48f8ac5b4c3f93b7b43a666fd3ec
parent6998a9f4c4e069f515c50614179f4cfc7d0184f5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Properly initialize icy headers string

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