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)
* qatar/master:
  http: Properly initialize icy headers string

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

Simple merge