diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:39:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:39:04 +0200 |
| commit | 7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071 (patch) | |
| tree | 4e3c6acef8b008570ae2db92455799014fc5eeca /libavformat/avformat.h | |
| parent | 9e6769d2dc7bb33a2317b85fb55239958119e78c (diff) | |
| parent | c23c96b638cbf6c489fd301e6b3d5555632fba37 (diff) | |
Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
lavf: add av_stream_get_side_data
Conflicts:
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 09870d1d35..2677c27e4d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1771,6 +1771,17 @@ const AVClass *avformat_get_class(void); */ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c); +/** + * Get side information from stream. + * + * @param stream stream + * @param type desired side information type + * @param size pointer for side information size to store (optional) + * @return pointer to data if present or NULL otherwise + */ +uint8_t *av_stream_get_side_data(AVStream *stream, + enum AVPacketSideDataType type, int *size); + AVProgram *av_new_program(AVFormatContext *s, int id); /** |