From 3d7b5ad217e2643811f3042ef91de02f5543f221 Mon Sep 17 00:00:00 2001 From: Jan Sebechlebsky Date: Mon, 4 Jul 2016 16:45:10 +0200 Subject: [PATCH] avformat/tee: Use ff_stream_encode_params_copy() Use ff_stream_encode_params_copy() to copy encoding-related fields (parameters) of stream. Reviewed-by: Nicolas George Signed-off-by: Jan Sebechlebsky Signed-off-by: Marton Balint --- libavformat/tee.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 9d0a4cb39e..c276a37a28 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -294,17 +294,9 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) ret = AVERROR(ENOMEM); goto end; } - st2->id = st->id; - st2->r_frame_rate = st->r_frame_rate; - st2->time_base = st->time_base; - st2->start_time = st->start_time; - st2->duration = st->duration; - st2->nb_frames = st->nb_frames; - st2->disposition = st->disposition; - st2->sample_aspect_ratio = st->sample_aspect_ratio; - st2->avg_frame_rate = st->avg_frame_rate; - av_dict_copy(&st2->metadata, st->metadata, 0); - if ((ret = avcodec_parameters_copy(st2->codecpar, st->codecpar)) < 0) + + ret = ff_stream_encode_params_copy(st2, st); + if (ret < 0) goto end; }