[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 23:22:37 2014 +0100| [11ed7ec092d33511376cffdcb232bfd1f3f56dd7] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11ed7ec092d33511376cffdcb232bfd1f3f56dd7
---