From patchwork Tue Jun 30 13:09:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20746 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 02484449D7F for ; Tue, 30 Jun 2020 16:09:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD5CE68925C; Tue, 30 Jun 2020 16:09:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65D8E687FAE for ; Tue, 30 Jun 2020 16:09:37 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id b15so16102545edy.7 for ; Tue, 30 Jun 2020 06:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=34GTrycI7F0bZ1fnc9vE2iXBD67Eeu2iQwgj8qrA+W0=; b=IZYM+TPq1oUBvCqumpIaIyC3g3Nfgm+0MufdD0+BW5T8zBh8T/um3SFNgRIulcjHgL StYnWDKbipkR1Z1vTL/XsKTWDsrZkC1u0XTX2YtrSoAFPmopl8mDHHy0sQDWLVDl5Lei spvPP0Y60AkYgF9A41fDZ6vqdL61Nz052LCcbUjyGAN44XUd36mztlLG7Syld53wmZUy U+6lkFIcNLNtZlw1my/LJk1aLBReUEY5Hzu7EptNLE92T4yYzOT3+9BrJtq5npEjtXPh 4m2Jsugen/gsqu3JxZcO4AQqYy6M4Ua1/ijVIMsLgo2sH3pjuis4AwrFJiM7BBygX5Fq 234w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=34GTrycI7F0bZ1fnc9vE2iXBD67Eeu2iQwgj8qrA+W0=; b=sUZTAk8/kJu+3SVMPWz+p10JFtlDzpy8uDfgThZZHYwBQ7wqGlg8jfrl98hILOSdGM 5xG1ExubHvsZzEZwvF00lDMzvyZ2UChZ/YT8a+CwbW5mp3Vrm7waBEQe94dTqpuj2UUS HhlhUAL13VpKF9d3VmpK75K8A9XltLLisnG5SHHDNFzrgEuTFj6K2inPhPIjwGYQluZ0 O7xZZFSCORa+mv1XvYy+gs2AmgpI/S9JHPHEk6oSE2VQM+a091q0XJtEi6uRn7ZD2djv 2lfdJt4O7bmFRXnez3Vhi7b/FXiUR/58M+XQHSWmb2XU/NkSEcgcdOCAzsrCT4maA5Cj ApEw== X-Gm-Message-State: AOAM531zpywQTSo4S3AiiFGKSveU4Yqw6L6AtTS3Vr071IyHYo/1ksRA TXRZGjyn/0k8BpGecRlbOhL0wu20 X-Google-Smtp-Source: ABdhPJwBTb8lJ3Hr9CP0GZ3CJaPMXZgS9Q0khRY4EkCLkKzaNz8oAcPMWr3rPT3G/PSI1jKCHpIxyw== X-Received: by 2002:a50:f413:: with SMTP id r19mr23958352edm.17.1593522576662; Tue, 30 Jun 2020 06:09:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id j24sm2713770edp.22.2020.06.30.06.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:09:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 15:09:09 +0200 Message-Id: <20200630130909.16449-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200630130909.16449-1-andreas.rheinhardt@gmail.com> References: <20200630130909.16449-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dump: Use intermediate pointer for access to programs array X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Improves readability. Signed-off-by: Andreas Rheinhardt --- libavformat/dump.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 3c76edfee4..1083d7db37 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -679,17 +679,18 @@ void av_dump_format(AVFormatContext *ic, int index, if (ic->nb_programs) { int j, k, total = 0; for (j = 0; j < ic->nb_programs; j++) { - const AVDictionaryEntry *name = av_dict_get(ic->programs[j]->metadata, + const AVProgram *program = ic->programs[j]; + const AVDictionaryEntry *name = av_dict_get(program->metadata, "name", NULL, 0); - av_log(NULL, AV_LOG_INFO, " Program %d %s\n", ic->programs[j]->id, + av_log(NULL, AV_LOG_INFO, " Program %d %s\n", program->id, name ? name->value : ""); - dump_metadata(NULL, ic->programs[j]->metadata, " "); - for (k = 0; k < ic->programs[j]->nb_stream_indexes; k++) { - dump_stream_format(ic, ic->programs[j]->stream_index[k], + dump_metadata(NULL, program->metadata, " "); + for (k = 0; k < program->nb_stream_indexes; k++) { + dump_stream_format(ic, program->stream_index[k], index, is_output); - printed[ic->programs[j]->stream_index[k]] = 1; + printed[program->stream_index[k]] = 1; } - total += ic->programs[j]->nb_stream_indexes; + total += program->nb_stream_indexes; } if (total < ic->nb_streams) av_log(NULL, AV_LOG_INFO, " No Program\n");