From patchwork Thu May 16 22:30:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13159 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 1449A44966A for ; Fri, 17 May 2019 01:45:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 649C368A5B4; Fri, 17 May 2019 01:43:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDF6668A518 for ; Fri, 17 May 2019 01:43:31 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 15so911199wmg.5 for ; Thu, 16 May 2019 15:43:31 -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=fYKjOsy3r3yWdHsjGN7mVCkQywLgAaGLMBUp2Fajd9A=; b=sqEUKzOtkmLLl0iwu6AjIoc1UgVwbBIm91jo0ZWHuyNvOytB53JA/25gqD87cNXzCk n3Q95YsmsL8YDiwrbanu2/oYtw++Wqttl501x72x9rj5Fz/3xOaEOjyo00+FWf+H1pRO A5CB7zZfv47oTmxDrInjFPVPxCJosgx9w6hWuNilLLnZOwfX1HzqPbq6CXL8JQIskYkl Cs4Im0xMxKLlCp9i5FRzRA3/R1Bs718eNvXe9fSyC60c+xGYZdjkqCSoztWSCgA8+SWl IyIrihS7Po+aM3kTxMbXfr8y0U6PpuMDvRx9SNpj98QZN7zbkN7ZlK0P31lKKUQn+aM7 HFkA== 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=fYKjOsy3r3yWdHsjGN7mVCkQywLgAaGLMBUp2Fajd9A=; b=sXkwxlWWSnj4eWZe2BKAIgAZ9ADmDLL9DHcx+JWFjALmCdHEvNYiXFGA935QCH0hEB OZ0HVxitAW/P5bSIIDteoy5cqvN7Wh1ee4VU++3IAjv85SXzzGp36oK2pHgLd4io9B+2 m7dakeou/iRq3SIpgKJn6wVdFVLtOe872g2wH7wED2GnP8UWXjzWmUwrc38RFT/CDVKM JkEdwymGjciRkl+HqeD16IXl8Nc0CgFVyC2pHPxpIWq/QfXQK36Q+AF1rvbsuKwTlxBO xtia+CrJnDB5s4XTAXLNxjZaWTiL2N135rjtrTf+2I6qLpg7Mu9J6GJUGmM6NbotcwCO R/tg== X-Gm-Message-State: APjAAAVTiNSPsz02+8mLvr1PiknjZEuqqzZ+rYR7zod3EYu35NdQ+eWB 0qHqRRPckOd4tY6L25b02cQJIvIk X-Google-Smtp-Source: APXvYqwa1t1JJzLVhWZ8HaZEPkiOFFN913R3N7JdiHVICSbip9KnTYN5CzoNvcin98JMa75Uq0GLgg== X-Received: by 2002:a05:600c:492:: with SMTP id d18mr14444254wme.59.1558046611141; Thu, 16 May 2019 15:43:31 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id i185sm11168725wmg.32.2019.05.16.15.43.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 15:43:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 00:30:19 +0200 Message-Id: <20190516223018.30827-36-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> References: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 35/37] avformat/matroskadec: 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also use the smallest scope possible for a loop variable. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 76 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index dfd5691b5a..d200dc9061 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1064,36 +1064,36 @@ static EbmlSyntax *ebml_parse_id(EbmlSyntax *syntax, uint32_t id) static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, void *data) { - int i, res; + int res; if (data) { - for (i = 0; syntax[i].id; i++) - switch (syntax[i].type) { - case EBML_UINT: - *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u; - break; - case EBML_SINT: - *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; - break; - case EBML_FLOAT: - *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f; - break; - case EBML_STR: - case EBML_UTF8: - // the default may be NULL - if (syntax[i].def.s) { - uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset); - *dst = av_strdup(syntax[i].def.s); - if (!*dst) - return AVERROR(ENOMEM); + for (int i = 0; syntax[i].id; i++) + switch (syntax[i].type) { + case EBML_UINT: + *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u; + break; + case EBML_SINT: + *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; + break; + case EBML_FLOAT: + *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f; + break; + case EBML_STR: + case EBML_UTF8: + // the default may be NULL + if (syntax[i].def.s) { + uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset); + *dst = av_strdup(syntax[i].def.s); + if (!*dst) + return AVERROR(ENOMEM); + } + break; } - break; - } - if (!matroska->levels[matroska->num_levels - 1].length) { - matroska->num_levels--; - return 0; - } + if (!matroska->levels[matroska->num_levels - 1].length) { + matroska->num_levels--; + return 0; + } } do { @@ -1225,18 +1225,18 @@ static int ebml_parse(MatroskaDemuxContext *matroska, } if (data) { - data = (char *) data + syntax->data_offset; - if (syntax->list_elem_size) { - EbmlList *list = data; - void *newelem = av_realloc_array(list->elem, list->nb_elem + 1, - syntax->list_elem_size); - if (!newelem) - return AVERROR(ENOMEM); - list->elem = newelem; - data = (char *) list->elem + list->nb_elem * syntax->list_elem_size; - memset(data, 0, syntax->list_elem_size); - list->nb_elem++; - } + data = (char *) data + syntax->data_offset; + if (syntax->list_elem_size) { + EbmlList *list = data; + void *newelem = av_realloc_array(list->elem, list->nb_elem + 1, + syntax->list_elem_size); + if (!newelem) + return AVERROR(ENOMEM); + list->elem = newelem; + data = (char *) list->elem + list->nb_elem * syntax->list_elem_size; + memset(data, 0, syntax->list_elem_size); + list->nb_elem++; + } } if (syntax->type != EBML_STOP) {