repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
avio.h
diff --git
a/ffmpeg/libavformat/avio.h
b/ffmpeg/libavformat/avio.h
index 2210c015a00cd7515b1f45f381cfb6c873e8aed7..b9b4017fb3e90073c7dc1dab0728891867b001fb 100644
(file)
--- a/
ffmpeg/libavformat/avio.h
+++ b/
ffmpeg/libavformat/avio.h
@@
-186,6
+186,9
@@
int avio_check(const char *url, int flags);
*
* @param buffer Memory block for input/output operations via AVIOContext.
* The buffer must be allocated with av_malloc() and friends.
*
* @param buffer Memory block for input/output operations via AVIOContext.
* The buffer must be allocated with av_malloc() and friends.
+ * It may be freed and replaced with a new buffer by libavformat.
+ * AVIOContext.buffer holds the buffer currently in use,
+ * which must be later freed with av_free().
* @param buffer_size The buffer size is very important for performance.
* For protocols with fixed blocksize it should be set to this blocksize.
* For others a typical size is a cache page, e.g. 4kb.
* @param buffer_size The buffer size is very important for performance.
* For protocols with fixed blocksize it should be set to this blocksize.
* For others a typical size is a cache page, e.g. 4kb.
@@
-289,10
+292,14
@@
int url_feof(AVIOContext *s);
int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
/**
int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
/**
- * Force flushing of buffered data
to the output s
.
+ * Force flushing of buffered data.
*
*
- * Force the buffered data to be immediately written to the output,
+ * For
write streams, for
ce the buffered data to be immediately written to the output,
* without to wait to fill the internal buffer.
* without to wait to fill the internal buffer.
+ *
+ * For read streams, discard all currently buffered data, and advance the
+ * reported file position to that of the underlying stream. This does not
+ * read new data, and does not perform any seeks.
*/
void avio_flush(AVIOContext *s);
*/
void avio_flush(AVIOContext *s);