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 | |
| 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')
| -rw-r--r-- | libavformat/avformat.h | 10 | ||||
| -rw-r--r-- | libavformat/internal.h | 7 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 | ||||
| -rw-r--r-- | libavformat/replaygain.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
6 files changed, 15 insertions, 12 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 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. * diff --git a/libavformat/mov.c b/libavformat/mov.c index 8493de954c..2910701ad5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -724,7 +724,7 @@ static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE, + ast = (enum AVAudioServiceType*)av_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE, sizeof(*ast)); if (!ast) return AVERROR(ENOMEM); @@ -756,7 +756,7 @@ static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE, + ast = (enum AVAudioServiceType*)av_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE, sizeof(*ast)); if (!ast) return AVERROR(ENOMEM); diff --git a/libavformat/replaygain.c b/libavformat/replaygain.c index 807f851542..707d3cd4f1 100644 --- a/libavformat/replaygain.c +++ b/libavformat/replaygain.c @@ -75,7 +75,7 @@ int ff_replaygain_export_raw(AVStream *st, int32_t tg, uint32_t tp, if (tg == INT32_MIN && ag == INT32_MIN) return 0; - replaygain = (AVReplayGain*)ff_stream_new_side_data(st, AV_PKT_DATA_REPLAYGAIN, + replaygain = (AVReplayGain*)av_stream_new_side_data(st, AV_PKT_DATA_REPLAYGAIN, sizeof(*replaygain)); if (!replaygain) return AVERROR(ENOMEM); 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; diff --git a/libavformat/version.h b/libavformat/version.h index 5a2f3f072d..99ae17d8f3 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 18 +#define LIBAVFORMAT_VERSION_MINOR 19 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |