Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 10:28:06 +0000 (11:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 10:30:42 +0000 (11:30 +0100)
commitf3c324a0fefd1a2dd4eff0be2e0d075d359d6235
tree15459162bfe1b6b9d80748c1b370a327123f1190
parent05e4b25e9b0a3586033dc21548b03c8e5071efe3
parent3a6bb9735053c453f806ceab1d91124648d90aca
Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'

* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
  Icecast: Send 100-continue header if possible

See: 17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/icecast.c