aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-08 01:12:57 -0300
committerJames Almer <jamrial@gmail.com>2017-04-08 01:12:57 -0300
commitb438a7868c8a672f103a6b50e9572f5d31f23ce3 (patch)
treef0cd2d4a4024ad12bb5575840e9ef69be0b8f330 /ffmpeg.c
parentd0a3143193ff3284f3dfbcc173bb94c9b91077d0 (diff)
downloadffmpeg-b438a7868c8a672f103a6b50e9572f5d31f23ce3.tar.gz
ffmpeg: use av_stream_new_side_data() in init_output_stream
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 55467c0bd2..e4b94b2fa0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3458,22 +3458,14 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
if (ost->enc_ctx->nb_coded_side_data) {
int i;
- ost->st->side_data = av_realloc_array(NULL, ost->enc_ctx->nb_coded_side_data,
- sizeof(*ost->st->side_data));
- if (!ost->st->side_data)
- return AVERROR(ENOMEM);
-
for (i = 0; i < ost->enc_ctx->nb_coded_side_data; i++) {
const AVPacketSideData *sd_src = &ost->enc_ctx->coded_side_data[i];
- AVPacketSideData *sd_dst = &ost->st->side_data[i];
+ 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);
}
}