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 49B0B472DE for ; Mon, 4 Sep 2023 15:06:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB4D768C843; Mon, 4 Sep 2023 18:04:45 +0300 (EEST) Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB84368C807 for ; Mon, 4 Sep 2023 18:04:40 +0300 (EEST) Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-5735282d713so982781eaf.2 for ; Mon, 04 Sep 2023 08:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839879; x=1694444679; darn=ffmpeg.org; 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=VDkMdmIJ94QZYMWAVoKar7Z3e4d+uFrafvCndYUItJ4=; b=e2qklijm1sMy5221JpuehLSX6tkjzq4onKzJB/F7goR+XXRg/zb5LCpcV1Wm8HOqXQ TlPUwW8Pz9386nvzBBmYGi6vmgynXxC69mnUAV4oz0CtPhKXbIqb1sSRj7og6gKWt60i kuZZTMa5wWS++Wmjk4wMCzsNN54cIhNln00WdSUZG33S70OxFGtvp8Wqq0UCe/rKEmMp ug3davlDKERY+wLc8GjaFD8tZVtOW4GcJf/gQwx8RysUz2Ajto2OhD/1KPuaQUzKy7D+ hUjwr4wOpUI+OjArsPhtpqDDITyVR/IDiVYZpXVmAVdADkG1JeXECigg8NXzz4K8QqES SDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839879; x=1694444679; 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=VDkMdmIJ94QZYMWAVoKar7Z3e4d+uFrafvCndYUItJ4=; b=Miwf31wW8X53UqpQfD/z7eaI8yCukegk89rIN2wbPTNqxrav1x6p24n91fjwD+EjIj WeHBz7B2EJWxrK0S3VnrT8DUkM55zH6o+6BJFJeXSXDLHA+nFA0ghxd/yzGMs7wXRvLT c31sCX8q5Udy6MaXN+VH5vsKqY1fawttUQUjPefwgq12QLwmZZcpHMFqNns6gte2KT7/ 4qqwugWmcIjNmqhUlMiRBJOiZRwl2HKCw/M2WBBawV61+KzUBZS7MJUQ87SVYZ3kpHeb SECLlckpkxX/GLoDuyenHm2LhgM5684IfXi3L9MXJ/gnfqrEY5tAlTWTdeh+HogrWcNp I4pA== X-Gm-Message-State: AOJu0Yz1gBliU0GsedIDbTepgtHKWSgaQig5soh5RdSpa9VMVWAvHCpC N88iwlmhCZ7SOEMlQJExt6Fu6t1q2uk= X-Google-Smtp-Source: AGHT+IFAS2NUu1T1Hl+9DUfHMLnKCr5aYR1rLub9hIgz2ZnCdUunve/Kq37fH8Z+zhQyw0oYWqOoxA== X-Received: by 2002:a05:6808:192a:b0:3a7:72e8:2728 with SMTP id bf42-20020a056808192a00b003a772e82728mr14163592oib.36.1693839879217; Mon, 04 Sep 2023 08:04:39 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:04:09 -0300 Message-ID: <20230904150411.56777-17-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/17] 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 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: 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 d7e34aad97..4fff483d12 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2433,19 +2433,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_side_data_set_new(&st->codecpar->side_data, - sd_src->type, sd_src->size, 0); - 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); @@ -2971,9 +2958,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (sti->avctx_inited) { 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; -- 2.42.0 _______________________________________________ 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".