From patchwork Sun Nov 8 19:50:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23433 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 CADE944AA31 for ; Sun, 8 Nov 2020 21:51:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2B8568BBA1; Sun, 8 Nov 2020 21:51:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A852168BB94 for ; Sun, 8 Nov 2020 21:50:59 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id v143so1599709qkb.2 for ; Sun, 08 Nov 2020 11:50:59 -0800 (PST) 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=wZxSSEo2pfv/T2Twv/deF4TPOCAN7x1fHGBgEXOTGKA=; b=ekuvFj5d/RHuHVxV4T4YccYYb+C8NCoZPeOf59ijbWyUFZSPSUox4qZ1CyCCPKWExz Z39QzXIETd2dEPR0mEtW5mT3x/YZMSY/WbJbPQuBC3RrlNFS0W/vC3HTFBK51O/qVL1L zZhvkG5aSQgcbZteCigU1bED7zveeysofSr4kqmpQ7hocIVAcYofMRd8nGBuXM6YZRfT rbpfO2muYFbCn17EA/dkl67XrYyol8m1LNDZcE1B8En6iB/0tOVE90siayyGx6V8FRlR wUYEBoQuBFqaVPsOF4MBDHR7MRV8+OD60ehmhCt66cwG7kfmu47rueXIEmUkjIqauH5+ kjpA== 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=wZxSSEo2pfv/T2Twv/deF4TPOCAN7x1fHGBgEXOTGKA=; b=ExQZx5Y9CvtbxXfGL6EUj8hBn0tu1dPnx6rAjs056NHJHXN54vhCcUqBUW69vft0wO n7fHwl6i10K72B0PFGmw8osZISFcqBiB/2wDNA/zxRrAuogOx9Mq4VVdN+OvmWa90xRW HcXTMo2KtgimIcviYrejOuDq/Kxu2lO6nTGbk/f151K++E4+bkyO6SeR9eHNRNWFj33S QEOx3Mq7Otja2ESA/iTnOjgm+OPIiOSOLUhMM9N025mOfadCZFB2ta/PUM0IAl9hv4oi ea3KvwkdyNnZkIeG3Wfk9yq79rhnCfnLkhdQd4zUYvMOB0k6Fp5UZxIwUzkf1pplLY1L o8UA== X-Gm-Message-State: AOAM532xncSc3MJunLZFQZlOeGI8v4eR0FQj9EU2c0E4XN8UzVlv8v47 EmurYWVSc6d6EK4pPwlshxW34jcPOAI= X-Google-Smtp-Source: ABdhPJxvnNj3p7GyTjNj2x9OYhjbF+bGuRY6h+NKtS05uc/3hVazHn6xbYqyuPFn6LzZ/PUhbXkoZg== X-Received: by 2002:a37:99c2:: with SMTP id b185mr10715059qke.81.1604865058190; Sun, 08 Nov 2020 11:50:58 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id i15sm447001qke.16.2020.11.08.11.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 11:50:57 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Nov 2020 14:50:43 -0500 Message-Id: <20201108195043.210799-4-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108195043.210799-1-andriy.gelman@gmail.com> References: <20201108195043.210799-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/nutenc: cosmetics 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Realign from previous commit and fix typo in comment. --- libavformat/nutenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 5a775a92fe..0323984556 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -506,7 +506,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) count += add_info(dyn_bc, t->key, t->value); - put_v(bc, 0); //stream_if_plus1 + put_v(bc, 0); //stream_id_plus1 put_v(bc, 0); //chapter_id put_v(bc, 0); //timestamp_start put_v(bc, 0); //length @@ -996,11 +996,11 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) goto fail; } } else { - if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { - ret = write_headers(s, bc); - if (ret < 0) - goto fail; - } + if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { + ret = write_headers(s, bc); + if (ret < 0) + goto fail; + } } if (key_frame && !(nus->last_flags & FLAG_KEY))