From patchwork Sun Aug 11 12:47:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 14407 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 5A7C14483B9 for ; Sun, 11 Aug 2019 15:48:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 424D068ABCD; Sun, 11 Aug 2019 15:48:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B5BB68AB72 for ; Sun, 11 Aug 2019 15:48:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1565527711; bh=7z8IDIwgNRZ0rjNg0gp6Hce3w7eiMuvPw90Qd/EPGwI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=amgFxPA/JBe4H9diRh1gBMxrpQYInT175O+HKNCa7jCbt8UIgGYEic3McHoxXloR1 of8tqzvs73bYH/S2D7oUtFc0vcgHaSdOm+HeSJ7ROQrOMMMHIZKBylve71awUpkRru 0tKRwQ68RuHWPVVg8MFAxZyf8uKwwK+EhizL5Y5U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.225.44]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M5cpk-1iCPJ92Ayu-00xbM8; Sun, 11 Aug 2019 14:48:31 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Sun, 11 Aug 2019 14:47:56 +0200 Message-Id: <51d7e39b0efa57976e605af26f7e3c564e04b328.1565527501.git.barsnick@gmx.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <08b3f8a989581481678dcd0ce5a06105269cdccf.1565527501.git.barsnick@gmx.net> References: <26f78761602ecfc977b70a736a2426ab95082e13.1565527501.git.barsnick@gmx.net> <572abbde623b7857287554aed91b0ea8dc2a437e.1565527501.git.barsnick@gmx.net> <08b3f8a989581481678dcd0ce5a06105269cdccf.1565527501.git.barsnick@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:sFE7d/G/nzq4Ha3VTcncFltehU+4RaKVxn+Xi+ZnkbYnm2Yb/9A 8QEgx9LZsHaHPtEc+YlSHURm4Nb7z+NjGfItaEy8TqxBvCDmMilaJXeX8ZJU3icoITz/LI3 +nDvi4Xf5rqWn6A9Om5+PfpSGtZ2ImMPdxtJ9q1dRifh4BWHmodn+FQaE4zu88yoM6NWf1g UqzGHETeg7jlNP+5OKD9w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:EpbLXJvyyg8=:5GHfXozyhp4pLGiFQjH3Kp Cgq8dFXC4rcoLPIGMvEyvSvPPGk3Hp3wizNYZK9ij10VfkjQjMz7MCkuJr73qaJE1szKD9+pK qZxzw3YhugdPPTEVHR85YcJIDcof7Wbkv/KLBH3sjry4X0YeLY7lf2EQCUc6WOT9V1ia+5Ns2 urd6Hv4TDURPVkb4Q0GujfUgZnEhaoxO9J+noEGU0uAz3B9hiyZBCGIwwXV6pFWgGW28PuKsL vdvylpgot/u/oN3TiOp4PpMCFYhqkty4QSq940ckLXnBluJIgXpN38GCK4/V0J0dtG0J5aSqu yTOevDwjcDPg8biw6LfyBPAT9ANNG+ygms/K2ke+VQ3TUw9ttKIt/ksrmAnAOM5GRnTmbCSCk stl8wQAOT5FJqS7fKX2WqQpeQpQ+K9OzFmWt0WZsxL7H+HQrPAzX1tfg8jwHBhLxmwgaUyitt IAZMDElbnkWv1rkmd3RXD4MpdXoHOpud9WVvnoVatPEtIBygpNqA+g6rTQqpqywkU5zmDvg4Y 7qAAMkDWFwMXBl+C7QLUZkLNYKZ+RKz/lpOCog0ItzYiy23OGkWhdRFkE0u8OXEe3KVwzOczU KA1ESYPOXGcExg3uFfXIEhdWVrlShe6IeXvSnLLwMScFGgbEUS7AJNr4dlphTDKETYlfIsqTT B+wXFe7iMsn2ujF3mBiJmCQjmnF6ES2TKB5Knw2Uy7g3nBlYUhTpnm4RQtzVzH5ZNo44udkl+ Evch6ZU+SD8Do5gjgEl6PTsF7s5ChIBT/XZqp4Nzv7dsfxwe1H/EfeJODkME9JHsbUCcKD1xf 2fh3hPL65zPiLpqJpQwmP5dx9hz2qGqchG5qC1GQcAfB8YTf9ku3A1v84uzZb/oNijwtPDcIe Yx6FZreW3sgSy2DPVbA0UjEIb+Btw8xPxbxzJP+fdXG17pBpoetMqEXIAlsfadob429QW/DWO 00cN0r2mqcvO8yyTEQ+/E3c+8WmiqRK8VeT9yjsEQwN1HsSFiIP0fko++C2FCfdF6R1mJZxfb pfYOWiJW8Uf6Y0Fn6cTGnSSubSiwndl/0QKIRv5vcd55wD2i8Mprz0TZhxjRqmcKUzXWuIpZ5 P/RRf7vA+1OHzz+VCfwLVt/CVpOaYkn1MeGNK4je141O6BWvJU3nxVDog== Subject: [FFmpeg-devel] [PATCH 4/4] avformat/hashenc: reindent after previous commit 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: Moritz Barsnick Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Moritz Barsnick --- libavformat/hashenc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index 394b8a0fce..070d4001b1 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -86,10 +86,10 @@ static int hash_write_header(struct AVFormatContext *s) if (!c->hashes) return AVERROR(ENOMEM); for (i = 0; i < num_hashes; i++) { - res = av_hash_alloc(&c->hashes[i], c->hash_name); - if (res < 0) - goto err; - av_hash_init(c->hashes[i]); + res = av_hash_alloc(&c->hashes[i], c->hash_name); + if (res < 0) + goto err; + av_hash_init(c->hashes[i]); } return 0; err: @@ -111,18 +111,18 @@ static int hash_write_trailer(struct AVFormatContext *s) struct HashContext *c = s->priv_data; int num_hashes = c->per_stream ? s->nb_streams : 1; for (int i = 0; i < num_hashes; i++) { - char buf[AV_HASH_MAX_SIZE*2+128]; - if (c->per_stream) { - snprintf(buf, sizeof(buf) - 200, "%d,%s=", i, av_hash_get_name(c->hashes[i])); - } else { - snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hashes[i])); - } - av_hash_final_hex(c->hashes[i], buf + strlen(buf), sizeof(buf) - strlen(buf)); - av_strlcatf(buf, sizeof(buf), "\n"); - avio_write(s->pb, buf, strlen(buf)); - avio_flush(s->pb); + char buf[AV_HASH_MAX_SIZE*2+128]; + if (c->per_stream) { + snprintf(buf, sizeof(buf) - 200, "%d,%s=", i, av_hash_get_name(c->hashes[i])); + } else { + snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hashes[i])); + } + av_hash_final_hex(c->hashes[i], buf + strlen(buf), sizeof(buf) - strlen(buf)); + av_strlcatf(buf, sizeof(buf), "\n"); + avio_write(s->pb, buf, strlen(buf)); + avio_flush(s->pb); - av_hash_freep(&c->hashes[i]); + av_hash_freep(&c->hashes[i]); } av_freep(&c->hashes); return 0;