summaryrefslogtreecommitdiff
path: root/libavformat/avio.c
Commit message (Collapse)AuthorAge
* avformat/avio: Fix unknown protocol handlingMichael Niedermayer2016-03-17
| | | | | | Fixes regression since bb8cc89b2986df6f60831b67cd250da312cce1d0 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: Add a protocol blacklisting APIDerek Buitenhuis2016-03-04
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'Derek Buitenhuis2016-02-29
|\ | | | | | | | | | | | | * commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2': protocols: make the list of protocols static Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * protocols: make the list of protocols staticAnton Khirnov2016-02-22
| | | | | | | | | | Disallow other code to touch it directly, now it's only accessible through a blacklisting/whitelisting function.
* | Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'Derek Buitenhuis2016-02-29
|\| | | | | | | | | | | | | * commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56': lavf: move urlcontext_child_class_next() to protocols.c Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: move urlcontext_child_class_next() to protocols.cAnton Khirnov2016-02-22
| | | | | | | | | | It needs to access the list of protocols directly, so it more properly belongs there.
* | Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'Derek Buitenhuis2016-02-29
|\| | | | | | | | | | | | | * commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6': lavf: move avio_enum_protocols() to protocols.c Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: move avio_enum_protocols() to protocols.cAnton Khirnov2016-02-22
| | | | | | | | It's a more appropriate place for it.
* | Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-29
|\| | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | 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.
* | avformat: add protocol_whitelistMichael Niedermayer2016-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | Note to maintainers: update tools Note to maintainers: set a default whitelist for your protocol If that makes no sense then consider to set "none" and thus require the user to specify a white-list for sub-protocols to be opened Note, testing and checking for missing changes is needed Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/avio: free url/avio optionsMichael Niedermayer2016-01-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/avio: Limit url option parsing to the documented casesMichael Niedermayer2016-01-20
| | | | | | | | | | | | | | | | | | This feature is not know much or used much AFAIK, and it might be helpfull in exploits. No specific case is known where it can be used in an exploit though subsequent commits depend on this commit though Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/avio: add ffurl_accept and ffurl_handshakeStephan Holljes2015-08-01
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | avformat/avio: Move avio_delete() avio_move() to avpriv_ namespaceMichael Niedermayer2015-06-29
| | | | | | | | | | | | | | | | | | This was suggested in the discussion about these functions With this change the functions are available internally but are not part of the public API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: set is_connected flag so url can be properly closedMariusz Szczepańczyk2015-06-24
| | | | | | | | | | Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avio: Extend API with avio_move() and avio_delete()Mariusz Szczepańczyk2015-06-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: clarify what package needs to be compiled with SSL supportwm42015-06-18
| | | | | | | | | | | | Try to reduce user confusion. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/tls: Support Secure TransportRodger Combs2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add directory listing APILukasz Marek2015-03-27
| | | | | | | | | | | | | | | | API allows protocol implementations to provide API that allows to list directory content. API is similar to POSIX opendir/readdir/closedir. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'Michael Niedermayer2015-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda': lavf: Explicitly convert types at function pointer assignment Conflicts: libavformat/avio.c libavformat/aviobuf.c libavformat/swfenc.c See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Explicitly convert types at function pointer assignmentDiego Biurrun2015-03-11
| | | | | | | | This fixes a number of "assignment from incompatible pointer type" warnings.
| * avio: fix sizeof argumentMichael Niedermayer2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732284
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Fix warning if https protocol was requested but isn't available.Carl Eugen Hoyos2014-08-12
| |
* | Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'Michael Niedermayer2014-07-27
|\| | | | | | | | | | | | | | | | | | | * commit 'ec4f04da1a3462dac429b9d15dee5f027309da15': avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as constDiego Biurrun2014-07-26
| |
* | lavf: Use av_gettime_relative()Olivier Langlois2014-05-17
| | | | | | | | | | | | | | | | | | Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avio: also set generic URL context optionsMichael Niedermayer2014-03-30
| | | | | | | | | | | | This should have no effect currently as there are no such options yet. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avio: fix ffurl_alloc error checksLukasz Marek2014-03-06
| | | | | | | | | | | | | | ffurl_alloc doc says it returns >= 0 in case of success. avio treats non-zero as errors. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavf/avio: Introduce avio_find_protocol_nameAlexander Strasser2014-02-16
| | | | | | | | | | | | | | Make it possible to find out what protocol will be chosen for a given URL. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | * qatar/master: lavf: Remove a now useless parameter to ffurl_register_protocol Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Remove a now useless parameter to ffurl_register_protocolMartin Storsjö2013-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in 9b07a2dc02e9 as an ABI hack to allow older code built with lavf 52 to register protocols even if the size of the URLProtocol struct was increased. Later, registering protocols from outside of lavf was removed and this workaround isn't needed any longer since lavf 53. This removes an unchecked malloc and a memory leak for the cases when this workaround actually was used - which it hasn't since lavf 53. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: Check for memory allocation failure of private dataDerek Buitenhuis2013-10-29
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | * commit '53151723e377b9c43f876e20d7f27a17993256c8': avio: K&R formatting cosmetics Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: K&R formatting cosmeticsLuca Barbato2013-10-28
| |
| * avio: Use AVERROR_PROTOCOL_NOT_FOUNDLuca Barbato2013-10-21
| | | | | | | | | | | | | | | | When the protocol is missing ffurl_alloc() should return AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT). Bug-Id: 577 CC: libav-stable@libav.org
| * avio: Handle AVERROR_EOF in the same way as the return value 0Michael Niedermayer2013-07-07
| | | | | | | | | | | | | | | | | | This makes sure the ffurl_read_complete function actually returns the number of bytes read, as the documentation of the function says, even if the underlying protocol uses AVERROR_EOF instead of 0. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avio: Check for memory allocation failure of private dataDerek Buitenhuis2013-10-27
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | retry_transfer_wrapper(): check for interrupt before operationAndrey Utkin2013-07-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Suggest recompilation with openssl or gnutls if the https protocol is not found.Carl Eugen Hoyos2013-07-10
| | | | | | | | Fixes ticket #2765.
* | avformat/avio: Fix EOF handiling of ffurl_read_complete()Michael Niedermayer2013-06-24
| | | | | | | | | | | | Fixes Ticket2537 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avio: check for : in filenames for protocols.Nicolas George2013-02-28
| | | | | | | | | | | | | | | | | | If the first "special" character in a filename is a comma, it can introduce protocol options, but only if there is a colon at the end. Otherwise, it is just a filename with a comma. Fix trac ticket #2303.
* | lavf/avio: check that the protocol supports the open mode.Nicolas George2013-02-24
| | | | | | | | Fix trac ticket #2139.
* | Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'Michael Niedermayer2012-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26': avio: fix pointer type mismatches in avio_enum_protocols() avserver: use socklen_t where appropriate udp: use socklen_t where appropriate network: use HAVE_THREADS instead of local hack af_channelmap: remove stray enum declaration buffersink: remove stray semicolon after function definition Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: fix pointer type mismatches in avio_enum_protocols()Mans Rullgard2012-10-27
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | avio: fix sizeof argumentMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID732284 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | url_alloc_for_protocol: fix use of uninitialized variableMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID703830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: replace ETIMEDOUT by EIOMichael Niedermayer2012-09-08
| | | | | | | | | | | | ETIMEDOUT is not available on all platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>