summaryrefslogtreecommitdiff
path: root/libavformat/icecast.c
Commit message (Collapse)AuthorAge
* Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'Michael Niedermayer2014-11-15
|\ | | | | | | | | | | | | | | * commit '3a6bb9735053c453f806ceab1d91124648d90aca': Icecast: Send 100-continue header if possible See: 17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Icecast: Send 100-continue header if possibleMarvin Scholz2014-11-15
| | | | | | | | | | | | | | | | | | | | This allows for proper error reporting. Only do this for non-legacy requests as only Icecast >2.4.0 will reply with a proper status. Libav seems to accept both, 100 and 200 status codes, but let's stay close to spec. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Icecast: Use 100-continue if possible for proper error handlingMarvin Scholz2014-11-11
| | | | | | | | | | | | | | | | | | Using 100-continue ffmpeg will only send data if the server confirms it, so if there is an error with auth or mounpoint, this allows that it is properly reported to the user. Else ffmpeg sends data and just quits at some point without an error message. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Icecast: always send a content-typeMarvin Scholz2014-11-11
| | | | | | | | | | | | | | | | use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1 Not using AVOption default because this breaks content-type warnings (needs to detect if no type was set by the user) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit '76c70e33d2244a688832f03b53862eb5d9ad3b01': icecast: Do not use chunked post Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * icecast: Do not use chunked postMark McGough2014-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by default chunked post. Icecast actually forwards the HTTP chunk headers to the listener as part of the media stream (without the chunk encoding HTTP headers) causing the players to lose sync. Disabling the option is enough to feed icecast properly. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc': Add Icecast protocol Conflicts: Changelog configure doc/protocols.texi libavformat/icecast.c libavformat/version.h See: e3dc2c86fc4178b100484c54f12c88705cdf6724 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add Icecast protocolMarvin Scholz2014-08-04
| | | | | | Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* libavformat: Add Icecast protocolePirat2014-08-04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>