aboutsummaryrefslogtreecommitdiff
path: root/libavformat/hlsproto.c
AgeCommit message (Collapse)Author
2019-01-23lavf/hlsproto: Replace a wrong eol comma with a semicolon.caohui
2018-04-12lavf/hlsproto: use ff_get_chomp_lineJun Zhao
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
2016-04-21Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-24avio: Copy URLContext generic options into child URLContextsMartin Storsjö
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>
2016-03-04avformat: Add a protocol blacklisting APIDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-29Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis
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>
2016-02-22urlprotocol: receive a list of protocols from the callerAnton Khirnov
This way, the decisions about which protocols are available for use in any given situations can be delegated to the caller.
2016-02-22lavf: reorganize URLProtocolsAnton Khirnov
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.
2016-02-02Update demuxers and protocols for protocol whitelist supportMichael Niedermayer
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-01-23Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'Michael Niedermayer
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4': hlsproto: Properly close avio buffer in case of error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23hlsproto: Properly close avio buffer in case of errorVittorio Giovara
Fix a memory leak. CC: libav-stable@libav.org Bug-Id: CID 717999
2015-01-06avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'Michael Niedermayer
* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea': lavf: Use av_gettime_relative Conflicts: libavformat/hls.c See: f78bc96b7c1c74caf99a7139cf81ce1110404965 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24lavf: Use av_gettime_relativeMartin Storsjö
The ones left using av_gettime are NTP timestamps (for RTCP, which is specified to send the actual current realtime clock in RTCP SR packets), and the NUT muxer timestamper, which is documented as using wallclock time. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-08replace calls to url_feof() with avio_feof()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'Michael Niedermayer
* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6': hlsproto: Store all durations in AV_TIME_BASE Conflicts: libavformat/hlsproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29hlsproto: Store all durations in AV_TIME_BASEMartin Storsjö
Also parse segment durations as floating point, which is allowed since HLS version 3. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'Michael Niedermayer
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201': lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft Conflicts: libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-11lavf: remove disabled FF_API_APPLEHTTP_PROTO cruftAnton Khirnov
2013-03-07Use the avstring.h locale-independent character type functionsReimar Döffinger
Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-03Remove incorrect use of ctype.h functions.Reimar Döffinger
As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-12-21miscellaneous typo fixesDiego Biurrun
2012-10-19hlsproto: fix integer overflowMichael Niedermayer
Fixes CID703743 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-06cosmetics: various spelling fixesLou Logan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22Replace usleep() calls with av_usleep()Mans Rullgard
This reduces the dependency on unistd.h which is not available on all systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-02-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (21 commits) CDXL demuxer and decoder hls: Re-add legacy applehttp name to preserve interface compatibility. hlsproto: Rename the functions and context hlsproto: Encourage users to try the hls demuxer instead of the proto doc: Move the hls protocol section into the right place libavformat: Rename the applehttp protocol to hls hls: Rename the functions and context libavformat: Rename the applehttp demuxer to hls rtpdec: Support H263 in RFC 2190 format rv30: check block type validity ttadec: CRC checking movenc: Support muxing VC1 avconv: Don't split out inline sequence headers when stream copying VC1 rv34: handle size changes during frame multithreading rv40: prevent undefined signed overflow in rv40_loop_filter() rv34: use AVERROR return values in ff_rv34_decode_frame() rv34: use uint16_t for RV34DecContext.deblock_coefs librtmp: Add "lib" prefix to librtmp URLProtocol declarations. movenc: Use defines instead of hardcoded numbers for RTCP types smjpegdec: implement seeking ... Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/rv30.c libavcodec/tta.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-14hlsproto: Rename the functions and contextMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-14hlsproto: Encourage users to try the hls demuxer instead of the protoMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-14libavformat: Rename the applehttp protocol to hlsMartin Storsjö
Keep the old protocol name around for backwards compatibility until the next bump. Deprecate the method of implicitly assuming the nested protocol. For applehttp://server/path, it might have felt logical, but supporting hls://server/path isn't quite as intuitive. Therefore only support hls+http://server/path from now on. Using this protocol at all is discouraged, since the hls demuxer is more complete and fits into the architecture better. There have been cases where the protocol implementation worked better than the demuxer, but this should no longer be the case. Signed-off-by: Martin Storsjö <martin@martin.st>