diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 15:39:19 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 15:39:19 +0000 |
commit | 04747c5a73af4a83574dde878688d2f8406034b4 (patch) | |
tree | 981348b07dba8c32c1ce68b07da1290724508180 /libavformat | |
parent | 39fdffa7367763bbcd464832a67f0a3e19599639 (diff) | |
parent | 7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a (diff) | |
download | ffmpeg-04747c5a73af4a83574dde878688d2f8406034b4.tar.gz |
Merge commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a'
* commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a':
lavf: use the io_open callbacks for files opened from open_input() as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2b6533c957..b843a4b344 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1841,9 +1841,9 @@ typedef struct AVFormatContext { /* * A callback for opening new IO streams. * - * Certain muxers or demuxers (e.g. for various playlist-based formats) need - * to open additional files during muxing or demuxing. This callback allows - * the caller to provide custom IO in such cases. + * Whenever a muxer or a demuxer needs to open an IO stream (typically from + * avformat_open_input() for demuxers, but for certain formats can happen at + * other times as well), it will call this callback to obtain an IO context. * * @param s the format context * @param pb on success, the newly opened IO context should be returned here |