From patchwork Sun May 17 23:13:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19723 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 6B9044489FD for ; Mon, 18 May 2020 02:13:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F5C96898F7; Mon, 18 May 2020 02:13:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08734680BD1 for ; Mon, 18 May 2020 02:13:29 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id m185so3415355wme.3 for ; Sun, 17 May 2020 16:13:28 -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:mime-version :content-transfer-encoding; bh=G/t+OJJMwvd2VnxEtvViliwxlnkLiTtAnx6TIdqr6rE=; b=eskbV/nt0PgKjvunFnCyGXohPTjrdsxzhnJmisNMk2W5cJ9FAWVKTQvWC3DL/m3hZG 226zYn1vKzPWAkfdD9/ytkQJmUtXY0lBJEImrWiDq+V/MQqPBH7NTJomKEUxZa3o4afR uiU6UwmUhAxH2J4S+dvXxxBxRPeRqwu5fLcA3s8I+ZYweS0CEiMJy2VHiGv0F45PsDAU mwFlN4wWN2Akx9a/ua8tz/tZvSkh8xLB5lIYD17w4sYkhrjPgIY4pc/WFh+Ple1Pjfyb GVhDZMHCtJ9uhxsqp0QFzoZe0zCmw8vE2DlmxTYrDlsQzvwC5DqJXF1DM0J7qvJA5z/v hecw== 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:mime-version :content-transfer-encoding; bh=G/t+OJJMwvd2VnxEtvViliwxlnkLiTtAnx6TIdqr6rE=; b=sgtqRjv948p7FEyK8JTGMmIDFl8Tcgr2aAJAN37Db7YLV8kDHeaAoZNt9LEYpoJ9tH kaqo+FIg5lE+O0gAPoDBU/w+HdHOatOOEx5WT25ns7KWNxjyotC9moFVcWFMUWEbOvOa L3/UvXe9fR+G9B2Y1LFsIUFyw9N2jXGGD4ruCcP8/PxFZWejEaYD5IG4g123kGbjn1Ej vEAY9guby2WW22SyurPAQC1HuepLCAVKx3BqeMCh8Gg1rQs4AjmnYhX+T0jUWkLJpVO8 PICNFcPfw15NeVXDHoCtnUn4JyEdNtVJT1GM00big5gaXkmbl6D3bCGoneYuVseNZmNX d2ig== X-Gm-Message-State: AOAM533nIXd+BK5oYi422cP7OKwrTbf0fn8Z5fOjBJk9TW5aqeZBD3wu 41LNqjlnb5NLFayjaXjIk+JxNmEH X-Google-Smtp-Source: ABdhPJxctg8/CMENnqMUedKBMUiU8tz9f/ULLtr82Mpj4ELFQRTSV+s6JJGnZswBwZHkUIg46LW1ig== X-Received: by 2002:a1c:8094:: with SMTP id b142mr16499321wmd.61.1589757208011; Sun, 17 May 2020 16:13:28 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:14 +0200 Message-Id: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/segment: Access AVStream more directly 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" by storing s->streams[i] in a pointer instead of constantly using s->streams[i]->... Signed-off-by: Andreas Rheinhardt --- libavformat/segment.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 32c09827eb..7e8bd65976 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -162,12 +162,11 @@ static int segment_mux_init(AVFormatContext *s) oc->flags = s->flags; for (i = 0; i < s->nb_streams; i++) { - AVStream *st; - AVCodecParameters *ipar, *opar; + AVStream *st, *ist = s->streams[i]; + AVCodecParameters *ipar = ist->codecpar, *opar; if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); - ipar = s->streams[i]->codecpar; opar = st->codecpar; avcodec_parameters_copy(opar, ipar); if (!oc->oformat->codec_tag || @@ -177,16 +176,16 @@ static int segment_mux_init(AVFormatContext *s) } else { opar->codec_tag = 0; } - st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; - st->time_base = s->streams[i]->time_base; - st->avg_frame_rate = s->streams[i]->avg_frame_rate; + st->sample_aspect_ratio = ist->sample_aspect_ratio; + st->time_base = ist->time_base; + st->avg_frame_rate = ist->avg_frame_rate; #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS - if (s->streams[i]->codecpar->codec_tag == MKTAG('t','m','c','d')) - st->codec->time_base = s->streams[i]->codec->time_base; + if (ipar->codec_tag == MKTAG('t','m','c','d')) + st->codec->time_base = ist->codec->time_base; FF_ENABLE_DEPRECATION_WARNINGS #endif - av_dict_copy(&st->metadata, s->streams[i]->metadata, 0); + av_dict_copy(&st->metadata, ist->metadata, 0); } return 0;