diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 20:19:10 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 20:19:10 +0300 |
| commit | ad317c94c5fad00f97881263647e316344f0a81e (patch) | |
| tree | 5a505dbfe80d7d795004c16a519baeb3457f8e0c /libavformat/internal.h | |
| 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/internal.h')
| -rw-r--r-- | libavformat/internal.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index acfee94d8a..ee860947e1 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -468,13 +468,6 @@ static inline int ff_rename(const char *oldpath, const char *newpath, void *logc } /** - * Add new side data to a stream. If a side data of this type already exists, it - * is replaced. - */ -uint8_t *ff_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, - int size); - -/** * Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end * which is always set to 0. * |