From e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 4 Oct 2015 13:17:41 +0200 Subject: avconv: pass the global codec side data to the muxer --- avconv.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index 7334851530..57a371835d 100644 --- a/avconv.c +++ b/avconv.c @@ -1602,6 +1602,28 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) exit_program(1); } + 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]; + + 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->st->time_base = ost->enc_ctx->time_base; } else { ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts); -- cgit v1.2.3