From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0730F42BCF for ; Sun, 31 Jul 2022 21:02:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3058068B9FD; Mon, 1 Aug 2022 00:02:43 +0300 (EEST) Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DC6068AE59 for ; Mon, 1 Aug 2022 00:02:36 +0300 (EEST) Received: by mail-ua1-f46.google.com with SMTP id c19so3857198uat.6 for ; Sun, 31 Jul 2022 14:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc; bh=t1M3hgmTC/DLoQj49tqb8YGillylAYEOrntTBwbNTgc=; b=nfYHwrsjP8+4oWYoLrnxnYISQ7LGRkMgJqnfJ0/qKHk8aKiGT79lDx24jyELPkXq0Y Afc1308YqRBLqZEFSZMQMUjFNz7Y5SJUpGFEx0dpjotJ2Gf8hKlrguUlj3RXlJmGUxLD IYMW/OsEDLvvhyI9rmg475FhL7Twf3T1qF5fDfvZTkreTFhu8R9TcTa8m2ueEUKRHvH4 TeYSYbFCiKspdvpQUGGGnJJW7+pNCGqojeuCm5qeXx/W/4QLBJ9QCKt0imxqImEvmDV2 R48MuXf6wbECygROgWClopHAYrt+VlMqd4VTvWHobTBykaQK4FbFOzhuasKg3jgzLiTQ ZLIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=t1M3hgmTC/DLoQj49tqb8YGillylAYEOrntTBwbNTgc=; b=YyD9LFkmJPqK5GNUBWQZtx2wtnAOzFraR8X61qBGoNNknLtCxtpFwzIsUEb4gVGM9s C3ulj8q5ykCQ5HKoU875iEDHxp6NSuKsKRmF+AkoP8Hrh516qWyHX/VgO4dE0BD8Ul/Y avocbriA8s81Jx0jlYUwJ7u+IUSoA8ip7uAwZp40yfKwEQibI/pjQu6C0L8J3OinGsXz FRjFI7fiBgUwk8eVbELrKZBdTpru00b1DhVy+ZusPD5fnCb2/GcmFw3g0iiMAfoBND6E XMC5lKRPHqg7DsD8J7rpqF0qSLHYQNOeq0bPRzkJFhXqdqCMyZGhAOrKsXT9hj2E2+8J WcqQ== X-Gm-Message-State: ACgBeo2Hm7AvKg6oZ/CbjHWPDyXuWUblOSYuqxlQx/X7ZQKbgWdJKpi3 db3tKOUkDDxHctrneLpw+lx98RkuFyM= X-Google-Smtp-Source: AA6agR6PTyqEK4RLrc2lsHb1CfGqFTB2NFAF+I8uQx8RBi3PPXxwM9cX0J6T9QKuSQuKYDk6pXvLqQ== X-Received: by 2002:ab0:3195:0:b0:387:3d5f:b67c with SMTP id d21-20020ab03195000000b003873d5fb67cmr3267622uan.91.1659301354212; Sun, 31 Jul 2022 14:02:34 -0700 (PDT) Received: from [192.168.0.11] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id z12-20020ab0770c000000b00382fc895404sm4957208uaq.31.2022.07.31.14.02.32 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Jul 2022 14:02:33 -0700 (PDT) Message-ID: Date: Sun, 31 Jul 2022 18:02:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220731203758.15667-1-pal@sandflow.com> From: James Almer In-Reply-To: <20220731203758.15667-1-pal@sandflow.com> Subject: Re: [FFmpeg-devel] [PATCH v4 1/2] avformat: refactor ff_stream_encode_params_copy() to ff_stream_params_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/31/2022 5:37 PM, pal@sandflow.com wrote: > diff --git a/libavformat/avformat.c b/libavformat/avformat.c > index 30d6ea6a49..1d0ac5ab7e 100644 > --- a/libavformat/avformat.c > +++ b/libavformat/avformat.c > @@ -235,6 +235,47 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) > return 0; > } > > +int ff_stream_params_copy(AVStream *dst, const AVStream *src) > +{ > + int ret; > + > + dst->id = src->id; > + dst->time_base = src->time_base; > + dst->start_time = src->start_time; > + dst->duration = src->duration; > + dst->nb_frames = src->nb_frames; > + dst->disposition = src->disposition; > + dst->discard = src->discard; > + dst->sample_aspect_ratio = src->sample_aspect_ratio; > + dst->avg_frame_rate = src->avg_frame_rate; > + dst->event_flags = src->event_flags; > + dst->r_frame_rate = src->r_frame_rate; > + dst->pts_wrap_bits = src->pts_wrap_bits; > + > + av_dict_free(&dst->metadata); > + ret = av_dict_copy(&dst->metadata, src->metadata, 0); > + if (ret < 0) > + return ret; > + > + ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); > + if (ret < 0) > + return ret; > + > + ret = ff_stream_side_data_copy(dst, src); > + if (ret < 0) > + return ret; > + > + if (src->attached_pic.size > 0) { > + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); > + if (ret < 0) > + return ret; > + } else { > + av_packet_unref(&dst->attached_pic); This would need to be called unconditionally, like you did for dst->metadata, and just if src->attached_pic is empty. > + } > + > + return 0; > +} > + > AVProgram *av_new_program(AVFormatContext *ac, int id) > { > AVProgram *program = NULL; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".