summaryrefslogtreecommitdiffstats
path: root/libavformat/icecast.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/doc, http, icecast, rtsp: Add option to disable send-expect-100Jun Li2019-03-311-1/+1
| | | | | | | | | | Fix ticket #7297 The current setting for send-expect-100 option is either enabled if applicable or forced enabled, no option to force disable the header. This change is to expand the option setting to provide more flexibility, which is useful for rstp case. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/icecast: Replace the number by macro for bprint initJun Zhao2018-06-171-1/+1
| | | | | | Replace the number by macro for bprint init. Signed-off-by: Jun Zhao <mypopydev@gmail.com>
* Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis2016-04-211-1/+1
|\ | | | | | | | | | | | | * commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avio: Copy URLContext generic options into child URLContextsMartin Storsjö2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all URLContexts have the same AVOptions, such AVOptions will be applied on the outermost context only and removed from the dict, while they probably make sense on all contexts. This makes sure that rw_timeout gets propagated to the innermost URLContext (to make sure it gets passed to the tcp protocol, when opening a http connection for instance). Alternatively, such matching options would be kept in the dict and only removed after the ffurl_connect call. Signed-off-by: Martin Storsjö <martin@martin.st>
| * urlprotocol: receive a list of protocols from the callerAnton Khirnov2016-02-221-1/+2
| | | | | | | | | | This way, the decisions about which protocols are available for use in any given situations can be delegated to the caller.
* | avformat: Add a protocol blacklisting APIDerek Buitenhuis2016-03-041-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | This commit also disables the async fate test, because it used internal APIs in a non-kosher way, which no longer exists. * commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d': lavf: reorganize URLProtocols Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: reorganize URLProtocolsAnton Khirnov2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of a linked list constructed at av_register_all(), store them in a constant array of pointers. Since no registration is necessary now, this removes some global state from lavf. This will also allow the urlprotocol layer caller to limit the available protocols in a simple and flexible way in the following commits.
| * Icecast: Send content-type in all casesMarvin Scholz2014-11-151-0/+2
| | | | | | | | | | | | | | | | This is needed because Icecast since version 2.4.1 doesn't default to audio/mpeg anymore. AVOption default not used here, since a later check if -content_type is set is performed and would break. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Update demuxers and protocols for protocol whitelist supportMichael Niedermayer2016-02-021-1/+2
| | | | | | | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch2015-12-041-2/+2
| |
* | avformat/icecast: Initialize .str based default for AV_OPT_TYPE_STRING typesMichael Niedermayer2015-10-311-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'Michael Niedermayer2014-11-151-1/+1
|\ \ | |/ | | | | | | | | | | | | * 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-151-0/+1
| | | | | | | | | | | | | | | | | | | | 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-111-0/+1
| | | | | | | | | | | | | | | | | | 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-111-0/+2
| | | | | | | | | | | | | | | | 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-131-0/+1
|\ \ | |/ | | | | | | | | | | * commit '76c70e33d2244a688832f03b53862eb5d9ad3b01': icecast: Do not use chunked post Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * icecast: Do not use chunked postMark McGough2014-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-14/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-041-0/+228
| | | | | | Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* libavformat: Add Icecast protocolePirat2014-08-041-0/+206
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud