diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 21:11:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 21:11:29 +0100 |
| commit | f3bb5f28d35ee6ba266f72e8d61ffd069c390559 (patch) | |
| tree | e447347d8778a20ef95a2781e70040eb44235a6f /libavformat/avio.h | |
| parent | 27f55beba2bf9c94996660556543dce1b3ed04b1 (diff) | |
| parent | 4d7ab5cfebef91820af2933ef2f622ea598e6b53 (diff) | |
| download | ffmpeg-f3bb5f28d35ee6ba266f72e8d61ffd069c390559.tar.gz | |
Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'
* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
doxygen: Add a number of missing function parameter descriptions
Conflicts:
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio.h')
| -rw-r--r-- | libavformat/avio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index bf23171502..defd6172bc 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -375,6 +375,7 @@ int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen); * * @param s Used to return the pointer to the created AVIOContext. * In case of failure the pointed to value is set to NULL. + * @param url resource to access * @param flags flags which control how the resource indicated by url * is to be opened * @return >= 0 in case of success, a negative value corresponding to an @@ -390,6 +391,7 @@ int avio_open(AVIOContext **s, const char *url, int flags); * * @param s Used to return the pointer to the created AVIOContext. * In case of failure the pointed to value is set to NULL. + * @param url resource to access * @param flags flags which control how the resource indicated by url * is to be opened * @param int_cb an interrupt callback to be used at the protocols level @@ -463,6 +465,8 @@ const char *avio_enum_protocols(void **opaque, int output); /** * Pause and resume playing - only meaningful if using a network streaming * protocol (e.g. MMS). + * + * @param h IO context from which to call the read_pause function pointer * @param pause 1 for pause, 0 for resume */ int avio_pause(AVIOContext *h, int pause); @@ -470,6 +474,8 @@ int avio_pause(AVIOContext *h, int pause); /** * Seek to a given timestamp relative to some component stream. * Only meaningful if using a network streaming protocol (e.g. MMS.). + * + * @param h IO context from which to call the seek function pointers * @param stream_index The stream index that the timestamp is relative to. * If stream_index is (-1) the timestamp should be in AV_TIME_BASE * units from the beginning of the presentation. |