ffmpeg | branch: master | Clément Bœsch <[email protected]> | Tue Jun 21 22:10:54 2016 +0200| [e276f21f995c147712005267f47cdcdae0d31dce] | committer: Clément Bœsch
Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92' * commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92': avio: Remove a leftover comment Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e276f21f995c147712005267f47cdcdae0d31dce --- libavformat/avio.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index 3ea52ec..5e86f7e 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -261,8 +261,6 @@ typedef struct AVIOContext { const char *protocol_blacklist; } AVIOContext; -/* unbuffered I/O */ - /** * Return the name of the protocol that will handle the passed URL. * ====================================================================== diff --cc libavformat/avio.h index 3ea52ec,d60a597..5e86f7e --- a/libavformat/avio.h +++ b/libavformat/avio.h @@@ -205,74 -115,9 +205,72 @@@ typedef struct AVIOContext * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable. */ int seekable; + + /** + * max filesize, used to limit allocations + * This field is internal to libavformat and access from outside is not allowed. + */ + int64_t maxsize; + + /** + * avio_read and avio_write should if possible be satisfied directly + * instead of going through a buffer, and avio_seek will always + * call the underlying seek function directly. + */ + int direct; + + /** + * Bytes read statistic + * This field is internal to libavformat and access from outside is not allowed. + */ + int64_t bytes_read; + + /** + * seek statistic + * This field is internal to libavformat and access from outside is not allowed. + */ + int seek_count; + + /** + * writeout statistic + * This field is internal to libavformat and access from outside is not allowed. + */ + int writeout_count; + + /** + * Original buffer size + * used internally after probing and ensure seekback to reset the buffer size + * This field is internal to libavformat and access from outside is not allowed. + */ + int orig_buffer_size; + + /** + * Threshold to favor readahead over seek. + * This is current internal only, do not use from outside. + */ + int short_seek_threshold; + + /** + * ',' separated list of allowed protocols. + */ + const char *protocol_whitelist; + + /** + * ',' separated list of disallowed protocols. + */ + const char *protocol_blacklist; } AVIOContext; - /* unbuffered I/O */ - /** + * Return the name of the protocol that will handle the passed URL. + * + * NULL is returned if no protocol could be found for the given URL. + * + * @return Name of the protocol or NULL. + */ +const char *avio_find_protocol_name(const char *url); + +/** * Return AVIO_FLAG_* access flags corresponding to the access permissions * of the resource in url, or a negative value corresponding to an * AVERROR code in case of failure. The returned access flags are _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
