From patchwork Thu Jul 20 20:34:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42870 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp77407pzh; Thu, 20 Jul 2023 13:35:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlHCebPek0HZmLZbhCSYxexc0VPR1SnmxruEB96fKzxTVtMxC0sGW6uPC+3nBjWaBHgkcg3w X-Received: by 2002:a17:906:535d:b0:965:fb87:4215 with SMTP id j29-20020a170906535d00b00965fb874215mr5808605ejo.15.1689885355102; Thu, 20 Jul 2023 13:35:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885355; cv=none; d=google.com; s=arc-20160816; b=Yz40piPayRTU3QO8DFMiK0L9iXRnxhOvURpfCfKHfN01l0KYPMqyAC98KrwK4CpQvr Y7r5GwGuDHOB9ysFC18pdyG1X3AygGHbdrnaVYovucq1Tot5JEHtrY8bLzeYZPAuHOnm y/IWnWQSCGIY5U3spDSKMsSktH0dr8LtZoMeE92vMEoO296P2AjAAdEw9/W+pV67HCZf Nhvq6KLTX8raqLLWEmMb0c17ycZcKbCCLQrBRG/EOPv7DwqCvyqUGTjMft5xTeBf58tr IjI1e1MgLKLflonx8igQRN7kCNCKcQWJk5fFDA7l+sh/dDjgQGNou4p1HwHmBHQg1lj8 6nxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=epY7U3rlKareOYgrRXtNHjrm+3mgzCMQFX2+PhtEvXw=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=wLX+b+cj0d6ba9E64l7+zz8aXWeoMuRFnJSA+0MFyyGnyvoHm0QpAllhHl6ik9OjNI 5xeMxav5SaPZ1KLvaY0T6eYFcRllM1hfDmXrRKaSluEy973dDFld0Kw/I9Ls5Fy1tLmN QHS7RbHiory62kXlTKDVljguzjhmPclZVHHt+m9jzUXEcsy9b6cGI6fBXIEwdlxOL6d5 yzSUqsXxC6j6wZv2JbPwyNeIt7WN8PyHmSlwFBMmJF9vm+MgnuF8bAoBhVgczbfmu+Xi 9fmNxOG4slJUDYPmv7uDKByDp8XekeWmprgrR2olYhgA4hh9O3miTkE3e1HhuwKHO7k0 7DhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="OA/CQRAe"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n23-20020a170906379700b00988be9d8c53si1199488ejc.946.2023.07.20.13.35.54; Thu, 20 Jul 2023 13:35:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="OA/CQRAe"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7CDC68C629; Thu, 20 Jul 2023 23:34:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA9B268C5A4 for ; Thu, 20 Jul 2023 23:34:38 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6bb0cadd372so359589a34.0 for ; Thu, 20 Jul 2023 13:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885277; x=1690490077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=izTpwJrdE6EpDX/e8GLuKzz8dNtdaNZ1RVFESnZsq1A=; b=OA/CQRAecbATbf7mOy/vxMWOJDdA9ITUGqMhIMw5QDAkyeleZ58+6dmAMTeLe14ioL pZrbpwsosZk2sc5ORZb1efYYnREAy5E39zoHnm2zIoKsPlWh4a+XzN0534T8Qn6Vr0VM Iev/Ngso5bIBFvodI4/ZKem864QIbrAfzzDrLX5JTMwpPVfKwe6OqvhMCzNZRWIV1QjZ SbbOoOcYKfxtbVUwjylcaxjTNrIB8Rgq2dLlC22Mhc57LV+410rrflAzpZJciDOLOL5H AmSKYoJcmicC0aBkmPJoCacyqJmrwOFyQ0DJoiM9Y5dWZu0aQN1GFQPtrEDOX3ddxQQX j8Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885277; x=1690490077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=izTpwJrdE6EpDX/e8GLuKzz8dNtdaNZ1RVFESnZsq1A=; b=bRk1Qnn3lwIgE1vx5pe5Bhi3blu8vUEph+LDvUXG+VVnDIwsOQKNRuciuNhlGSkCtU CBJ2R6KpqCHvJMhO6BBu7uUO3y1GMSEisnqkJuzsnWgGfohB3aPX/gfIY/aFp9wm0YEd ePM44n8Wmvil4Fdb/hG/H4NqHOCDl170P8NQ86HI3/tfWgKx1CDUDk6QrgfYxIk4ikVU QAFVLdnL/7YJCBkdwTIxi+Zc01jK+hrGmTpiiOpt/BR9wtUX/QDWET3dVcQYOFVpOiv7 b8naZ+XjoMP2bt6/FoVKRESLiUfkIefIqEl7OyflvHz5qj73wkxGApHZkvc1Mzjq9IB1 bkKg== X-Gm-Message-State: ABy/qLaBNqa+9sMv7RAGrSgi5+yU3OzfljgY7HO/CW/uNO9xN1O6KZz7 B7hhf1KokthvpAC9kZ7kS2UTsELkUvU= X-Received: by 2002:a9d:77ca:0:b0:6b8:6c1d:d83d with SMTP id w10-20020a9d77ca000000b006b86c1dd83dmr4024165otl.26.1689885276990; Thu, 20 Jul 2023 13:34:36 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m24-20020a0568301e7800b006b95e17fcc7sm800094otr.49.2023.07.20.13.34.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:14 -0300 Message-ID: <20230720203415.41757-12-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720203415.41757-1-jamrial@gmail.com> References: <20230720203415.41757-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/13] avformat/demux: stop copying the internal AVCodecContext coded_side_data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tnsCHvXvk9oj It's no longer needed Signed-off-by: James Almer --- libavformat/demux.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 7253196a82..24bc8fce2a 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2432,19 +2432,6 @@ static int extract_extradata(FFFormatContext *si, AVStream *st, const AVPacket * return 0; } -static int add_coded_side_data(AVStream *st, AVCodecContext *avctx) -{ - for (int i = 0; i < avctx->nb_coded_side_data; i++) { - const AVPacketSideData *const sd_src = &avctx->coded_side_data[i]; - AVPacketSideData *sd_dst = av_packet_new_side_data_to_set(&st->codecpar->side_data_set, - sd_src->type, sd_src->size); - if (!sd_dst) - return AVERROR(ENOMEM); - memcpy(sd_dst->data, sd_src->data, sd_src->size); - } - return 0; -} - int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) { FFFormatContext *const si = ffformatcontext(ic); @@ -2972,9 +2959,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) ret = avcodec_parameters_from_context(st->codecpar, sti->avctx); if (ret < 0) goto find_stream_info_err; - ret = add_coded_side_data(st, sti->avctx); - if (ret < 0) - goto find_stream_info_err; } #if FF_API_AVSTREAM_SIDE_DATA