virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avformat: expose av_stream_new_side_data helper

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
John Stebbins
2015-11-05 09:49:02 -08:00
committed by Anton Khirnov
parent 21ab6fd01b
commit 7f4ec4364b
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@@ -12,6 +12,10 @@ libavutil: 2015-08-28
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
Add av_xtea_le_init and av_xtea_le_crypt

10
libavformat/avformat.h
View File

@@ -1343,6 +1343,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.
*

7
libavformat/internal.h
View File

@@ -419,11 +419,4 @@ static inline int ff_rename(const char *oldpath, const char *newpath)
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 */

4
libavformat/mov.c
View File

@@ -684,7 +684,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);
@@ -716,7 +716,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);

2
libavformat/replaygain.c
View File

@@ -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);

2
libavformat/utils.c
View File

@@ -3140,7 +3140,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;

2
libavformat/version.h
View File

@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 0
#define LIBAVFORMAT_VERSION_MINOR 1
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \