[FFmpeg-cvslog] Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 15 11:51:45 2014 +0100| [42c8db69b686949ff726b2886305f31fe40f3ab1] | committer: Michael Niedermayer

Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'

* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
  Icecast: Send content-type in all cases

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

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