RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: use av_stream_new_side_data() 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-12-26 18:33:06 -03:00
parent faa94a576f
commit 9f102653fd
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffmpeg.c
View File

@ -3062,23 +3062,14 @@ static int init_output_stream_streamcopy(OutputStream *ost)
ost->st->disposition = ist->st->disposition;
if (ist->st->nb_side_data) {
ost->st->side_data = av_realloc_array(NULL, ist->st->nb_side_data,
sizeof(*ist->st->side_data));
if (!ost->st->side_data)
return AVERROR(ENOMEM);
ost->st->nb_side_data = 0;
for (i = 0; i < ist->st->nb_side_data; i++) {
const AVPacketSideData *sd_src = &ist->st->side_data[i];
AVPacketSideData *sd_dst = &ost->st->side_data[ost->st->nb_side_data];
uint8_t *dst_data;
sd_dst->data = av_malloc(sd_src->size);
if (!sd_dst->data)
dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size);
if (!dst_data)
return AVERROR(ENOMEM);
memcpy(sd_dst->data, sd_src->data, sd_src->size);
sd_dst->size = sd_src->size;
sd_dst->type = sd_src->type;
ost->st->nb_side_data++;
memcpy(dst_data, sd_src->data, sd_src->size);
}
}