From patchwork Thu Jul 20 20:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp77170pzh; Thu, 20 Jul 2023 13:35:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlEWIf2QNxQM+iLBe3HGBCXRtacQLFJcjHOQvFvOFJT8H4guodgLqQKSHa+c0NLlSaH7UapI X-Received: by 2002:a17:907:1c26:b0:98d:4b97:acc8 with SMTP id nc38-20020a1709071c2600b0098d4b97acc8mr6450603ejc.25.1689885329142; Thu, 20 Jul 2023 13:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885329; cv=none; d=google.com; s=arc-20160816; b=aGowXqsm45g7Rme/NwzSehxssxGXT11CnnVUZVLPpDiuz81VzHtLkijm0G7TxtjSSs ubQ/SKQayhcvK0YmWSyuzxFSRQPHAsOPJPFh4U1E1VZT5It3mXAJVS0oO8qvfyxaOB2H I7d0cH5PbWcTg00v6WzPpa4TgoIsjTutjazeQgdq2G4Xc8vD7LI1tcmOGJao49sF3FtU ao3os2CzsJaTrsdpszQzJ+9PAkE1TD+7cMtkfdiSqD01PXoriRDuHNkqsxdD2PB0kwpa gUDmFnAMZHqsxkhB+yKIjnKiZc23s78oW0EvT62hV7b6daBKULkKYZLzX55T68VZR/BG lpOQ== 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=AsrMN0pQLzvM4ANtjPCvxVHPkIfksaHOFZwg7Dy8T0E=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=Cy5lpLT2+P6ZCg2ogsr/1E/OKNu98VPQYokmIqmOPqSZjxesZTeOjf53ctPrJfAlUh hjg90V8rYJSRGyO7nHP2rVIPlJtBohgXPkYg130IONZMgzGz1/EbDO8UrS/U8od5myO4 NwZ9N4rPH03rutO030QRjavmcjDSaWmx1w2oc8g7r5Hyb1ccgk4qrESpyswktUqs8ncf 2wblBZKDkFe9ChRAViuNSxqUQQQXcwqpyD+KweACmFgYD+jmIWIPyPZSnTmRHzQb7zPT 3TGWXOhj2dnP09N/6+zPiD8p0UEDX+8tSKcufK84l3Pt9p5nfiR7Q9wjsHoFyAbGt7Kj t6Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=TAenOyhE; 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 j17-20020a1709062a1100b00992b32e3e3esi1203586eje.468.2023.07.20.13.35.28; Thu, 20 Jul 2023 13:35:29 -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=TAenOyhE; 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 48FAB68C5A4; Thu, 20 Jul 2023 23:34:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8FD168C55C for ; Thu, 20 Jul 2023 23:34:31 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6b9f46ec07aso811872a34.1 for ; Thu, 20 Jul 2023 13:34:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885270; x=1690490070; 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=DMwEoaYgNUvJED0CXa91pYEnXUG8gGWpBsm0o7t7ZYw=; b=TAenOyhEr0KBReqseQZvYverk9cDHH74TmpNI83HWdoBaUgWN+FbXbyDE5ZPdROma1 FMP6mdjP1YDlAHuDiONTWj3TRmV4W57rw5f790enctHiDLQPKWx3/iKpUtYs6z3eGAtU 4y9z08Bip8PPtDNWXKoKEAfk8zw0XtaiWSyxLeZG1i2rmpKBZWA5h+a30PhM+NM2Af5l hpwjfcN5TyE0IiuuONDbLmMUDRxtsKviW8TUKC4FPbJA02u7fsbmUxNI/fIv/YawLHiP KdZf+/nJ9MMeQPNDK1DFILP42LnlTi0NnUIQevecSTaZ0z/FzY+KqA1l3XlzsqTaLkg4 TN5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885270; x=1690490070; 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=DMwEoaYgNUvJED0CXa91pYEnXUG8gGWpBsm0o7t7ZYw=; b=lWNI14WrE1B2A94C5DJbSdZ4DuN3jdJ6GufBNJk/zmmoSVxVFYKjUOgBy0p5oItCuH WBKAHvOjt0O9zAUbDu9YJUVDGShD0oaAGVwosqP9ye1UQ0Qu7g7/fRAGBaRUw1NpwQlw X579w+XyRcnQYm48rQGOsuGPPH4A1crU1c9yyEH8ce6kMRS+vhBHVFGGMWakAdoj7yI4 nsuL5r/k/utDp4MGGLOrseEsJCrsoocHx5hl39LV2MBmFA6fB4XWsabLkEhlwuwmGpNz if0OGmoNJG5Jtm0NAp+CMZaHRv49x0+biK8Y1YNNBLI4QQoB1TAdRnDtouvo3exg85uR ygLQ== X-Gm-Message-State: ABy/qLa1E9xkCSsAJMVjmRB8joC0dk8NlMk4BAmWbBpHZLD1ZWxFpSvh ae32WDYGHArf+SCKQP9tSxNHP8QD2qw= X-Received: by 2002:a05:6830:78b:b0:6b9:57d2:8ec1 with SMTP id w11-20020a056830078b00b006b957d28ec1mr2859096ots.2.1689885270148; Thu, 20 Jul 2023 13:34:30 -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.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:08 -0300 Message-ID: <20230720203415.41757-6-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 06/13] fftools/ffprobe: stop using AVStream.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: DdnRNhsQe8G3 Signed-off-by: James Almer --- fftools/ffprobe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a39185f6fe..b60fd8eb1f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3186,8 +3186,9 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id if (do_show_stream_tags) ret = show_tags(w, stream->metadata, in_program ? SECTION_ID_PROGRAM_STREAM_TAGS : SECTION_ID_STREAM_TAGS); - if (stream->nb_side_data) { - print_pkt_side_data(w, stream->codecpar, stream->side_data, stream->nb_side_data, + if (stream->codecpar->side_data_set.nb_side_data) { + print_pkt_side_data(w, stream->codecpar, stream->codecpar->side_data_set.side_data, + stream->codecpar->side_data_set.nb_side_data, SECTION_ID_STREAM_SIDE_DATA_LIST, SECTION_ID_STREAM_SIDE_DATA); }