diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:19:10 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:19:10 +0000 |
| commit | ad317c94c5fad00f97881263647e316344f0a81e (patch) | |
| tree | 5a505dbfe80d7d795004c16a519baeb3457f8e0c /libavformat/avformat.h | |
| parent | 2bf93dfd96549777701a2031c23dac2cdb7257ee (diff) | |
| parent | 7f4ec4364bc4a73036660c1c6a3c4801db524e9e (diff) | |
| download | ffmpeg-ad317c94c5fad00f97881263647e316344f0a81e.tar.gz | |
Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'
* commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e':
avformat: expose av_stream_new_side_data helper
Conflicts:
libavformat/internal.h
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index beae067c61..36f9d029b9 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1940,6 +1940,16 @@ const AVClass *avformat_get_class(void); AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c); /** + * Allocate new information from stream. + * + * @param stream stream + * @param type desired side information type + * @param size side information size + * @return pointer to fresh allocated data or NULL otherwise + */ +uint8_t *av_stream_new_side_data(AVStream *stream, + enum AVPacketSideDataType type, int size); +/** * Get side information from stream. * * @param stream stream |