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/utils.c | |
parent | 2bf93dfd96549777701a2031c23dac2cdb7257ee (diff) | |
parent | 7f4ec4364bc4a73036660c1c6a3c4801db524e9e (diff) |
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/utils.c')
-rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3924647744..f33f2f505b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4594,7 +4594,7 @@ uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type, return NULL; } -uint8_t *ff_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, +uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, int size) { AVPacketSideData *sd, *tmp; |