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 F23E042C04 for ; Sun, 31 Jul 2022 21:53:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 039A568B9AC; Mon, 1 Aug 2022 00:53:46 +0300 (EEST) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B791B68B6AF for ; Mon, 1 Aug 2022 00:53:39 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id o3so8873893ple.5 for ; Sun, 31 Jul 2022 14:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandflow-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=urdgemiwKvS23ANW+69kWfvIfZb0J/2iHqOPYhgfN8Q=; b=5U3CtJTNIf4Co0VaYW7d0DFL5LtLbtNVAy3Ji8M1Ru4OKTY64G5CyQnesg1shFopd4 t1T4cGq1AWfWXTyEoGBZkrJkphxgxDDJKDZB03ZDZrI746vhmnTOnN/Hd3kOo9Cr8Skk WqfwIaWBj1e4oyzQdPrHlVywRWnc9QHxSOkSM5jB+2oLzNgEb9T5pvWMqhcBEObast9B +h24nbaRqW6MbpcbTsVOeCiDBG6JLz/i6Y3KvD/JppggnTK5eYwkqvp5ZMn9sQ94GPzI QZylZZMisUMdviF+hTMHtb4Fpo3QxBJXObWm/YiFNMko9XMGOyzHRC3BggzZnc5TVpFT Iygw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=urdgemiwKvS23ANW+69kWfvIfZb0J/2iHqOPYhgfN8Q=; b=sUSegBKFG9ElOLrw6Fg6jYPvEMDaz0xiPyoXyQC4M6VRq7XSOOAlzjLqANxTzwkS0O DsEIw8reEA5nBn0G0+g/c1WayC+ItNDx4PmlxFZR6st+byEM4rd7Im0CxiHYautU8gT1 L5Y2tMrv7AzsFdh3MyMewc/bysv4Nz91WNzEQ4hSkrCF9OOyU/e5bReBglHDYpY5KJfT vSvt++iZL26qen8YyuKKVlbNSG3dnGuGYygv1/p57dmjEAzQFakrFS2Am89OolFllE9L 4Ak8ed1PjoHcN5hVQpIg6m1cY2YRjV7LAhV0SyLTd15G1UlNCQmHmSXtzii0fYDrWQPs YFbA== X-Gm-Message-State: ACgBeo3L1IQQuOTTWsG84qQoBr/k6zJfFLgV+aCK1C8ZX1Im6A38QDd2 +jfaFAXj/e1z3Lbg4rcNN4M+ZrQnPqAIxw== X-Google-Smtp-Source: AA6agR6xuYxdpb3iDvu92cozc93iEu7BSH94rlhUX3bueap4V+/HTxGzdCwA1c3fzeIxf1LMbzzGvg== X-Received: by 2002:a17:90b:4a50:b0:1f4:f1b9:d21f with SMTP id lb16-20020a17090b4a5000b001f4f1b9d21fmr4639553pjb.185.1659304417506; Sun, 31 Jul 2022 14:53:37 -0700 (PDT) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com. [209.85.210.179]) by smtp.gmail.com with ESMTPSA id f4-20020a170902ce8400b0015e8d4eb1d5sm8110293plg.31.2022.07.31.14.53.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Jul 2022 14:53:36 -0700 (PDT) Received: by mail-pf1-f179.google.com with SMTP id b133so8988514pfb.6 for ; Sun, 31 Jul 2022 14:53:36 -0700 (PDT) X-Received: by 2002:a63:5964:0:b0:411:4724:e618 with SMTP id j36-20020a635964000000b004114724e618mr10754974pgm.484.1659304416322; Sun, 31 Jul 2022 14:53:36 -0700 (PDT) MIME-Version: 1.0 References: <20220731203758.15667-1-pal@sandflow.com> In-Reply-To: From: Pierre-Anthony Lemieux Date: Sun, 31 Jul 2022 14:53:24 -0700 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, Jul 31, 2022 at 2:02 PM James Almer wrote: > > 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. Thanks. I had incorrectly assumed that av_packet_ref() first unref'ed the destination. Addressed at v5: http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299515.html > > > + } > > + > > + 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". _______________________________________________ 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".