Commit 7f4ec436 authored by John Stebbins's avatar John Stebbins Committed by Anton Khirnov

avformat: expose av_stream_new_side_data helper

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 21ab6fd0
...@@ -12,6 +12,10 @@ libavutil: 2015-08-28 ...@@ -12,6 +12,10 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2015-11-xx - xxxxxxx - lavf 57.1.0 - avformat.h
Add av_stream_new_side_data().
2015-11-xx - xxxxxxx - lavu 55.3.0 - xtea.h 2015-11-xx - xxxxxxx - lavu 55.3.0 - xtea.h
Add av_xtea_le_init and av_xtea_le_crypt Add av_xtea_le_init and av_xtea_le_crypt
......
...@@ -1343,6 +1343,16 @@ const AVClass *avformat_get_class(void); ...@@ -1343,6 +1343,16 @@ const AVClass *avformat_get_class(void);
*/ */
AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c); 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. * Get side information from stream.
* *
......
...@@ -419,11 +419,4 @@ static inline int ff_rename(const char *oldpath, const char *newpath) ...@@ -419,11 +419,4 @@ static inline int ff_rename(const char *oldpath, const char *newpath)
return 0; return 0;
} }
/**
* 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);
#endif /* AVFORMAT_INTERNAL_H */ #endif /* AVFORMAT_INTERNAL_H */
...@@ -684,7 +684,7 @@ static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -684,7 +684,7 @@ static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; 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)); sizeof(*ast));
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
...@@ -716,7 +716,7 @@ static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -716,7 +716,7 @@ static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; 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)); sizeof(*ast));
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -75,7 +75,7 @@ int ff_replaygain_export_raw(AVStream *st, int32_t tg, uint32_t tp, ...@@ -75,7 +75,7 @@ int ff_replaygain_export_raw(AVStream *st, int32_t tg, uint32_t tp,
if (tg == INT32_MIN && ag == INT32_MIN) if (tg == INT32_MIN && ag == INT32_MIN)
return 0; 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)); sizeof(*replaygain));
if (!replaygain) if (!replaygain)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -3140,7 +3140,7 @@ uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type, ...@@ -3140,7 +3140,7 @@ uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type,
return NULL; 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) int size)
{ {
AVPacketSideData *sd, *tmp; AVPacketSideData *sd, *tmp;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 0 #define LIBAVFORMAT_VERSION_MINOR 1
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment