From 88b32673db39440422a73ec3047d3326c96b4fb2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 18 Oct 2014 18:19:55 +0200 Subject: avconv: copy stream-level side data when streamcopying --- avconv.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index 23f69cb517..8e76863bec 100644 --- a/avconv.c +++ b/avconv.c @@ -1753,6 +1753,26 @@ static int transcode_init(void) } else enc_ctx->time_base = ist->st->time_base; + 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); + + for (j = 0; j < ist->st->nb_side_data; j++) { + const AVPacketSideData *sd_src = &ist->st->side_data[j]; + AVPacketSideData *sd_dst = &ost->st->side_data[j]; + + sd_dst->data = av_malloc(sd_src->size); + if (!sd_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++; + } + } + ost->parser = av_parser_init(enc_ctx->codec_id); switch (enc_ctx->codec_type) { -- cgit v1.2.3