From patchwork Sat Sep 10 05:31:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 520 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp644595vsd; Fri, 9 Sep 2016 22:31:39 -0700 (PDT) X-Received: by 10.194.95.36 with SMTP id dh4mr5973419wjb.156.1473485499039; Fri, 09 Sep 2016 22:31:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 73si6063267wmu.116.2016.09.09.22.31.37; Fri, 09 Sep 2016 22:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 986E2689EFB; Sat, 10 Sep 2016 08:31:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 802A9689DC6 for ; Sat, 10 Sep 2016 08:31:10 +0300 (EEST) Received: by mail-oi0-f66.google.com with SMTP id s71so10384221oih.3 for ; Fri, 09 Sep 2016 22:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=k1F0kB7wR6jLe1o+TRUnpae1BSDNABK6DAGNCbbaKsw=; b=Y2ZLFarwizmFR3mhk4f9rLM07Ao7Zdp/uNEDJnSZ3BxkVBRaJW3xEiwabWhoo8z7hy XNZe55vC9JklM+N1zzR5pSV0C04BokX1SEtiJlrN23bpO1zZd3fxGBtutT35TOfW2URm mk3vF8jcu4j28Yaph3a2gmK0pW0ExIY4QXNQS7Jrc2qIZPHeVqAYb/BG9w8db1XxV76K ibyzBnq3Xw49NKcwOLg9pc41UDu10uuOrzz4y2PFZSQUYrFQ6Kwndwny9TlKv8iyVKhf IxhZns0CfGKVBKcS3t03cGG+U4eOwg5axs5Z9tvLRSvlk4hiH7PdctlEJm0eTIzRa9fE 0kjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=k1F0kB7wR6jLe1o+TRUnpae1BSDNABK6DAGNCbbaKsw=; b=SOeeFjhqRTpnMUqqqKaufn3OkYHjv6uuphdhWmmnz6X61S/wydlMzMp0XjAoFVNrUH c1SiqVvaPtQCmmIdz6UU5siDJvYSWxGqN4rldKaXOg23WeBo8L9nV/rLSniq2AJUzhU2 0N3OafkAU0eAEXoAP3FWEIsSCZzzQstSHdWPZyedOGkJJ2jyQyaVhJEA0CYzkARGLklK xyfY66XPxSnOw9pKXLd9KPbWzMTYqR6OurLgCmhJVD8izHYt4QYAwrHr0T6GmcBfXWu4 vnKjvjg66igomm8+KQ7o6IQOfTiDZ4hHX25bHKAyAO4SzmauSPqhXgvO/OCcV573/3b3 hSQw== X-Gm-Message-State: AE9vXwODez6S10ANaXTvBUY6i9KkE2tWAqIrlGxowvIAlcoxKm2wBo5BLJD+Kh88UCjCxA== X-Received: by 10.202.58.68 with SMTP id h65mr10665632oia.27.1473485480208; Fri, 09 Sep 2016 22:31:20 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id c72sm3736291itd.19.2016.09.09.22.31.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Sep 2016 22:31:19 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2016 00:31:13 -0500 Message-Id: <20160910053113.99251-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160910053113.99251-1-rodger.combs@gmail.com> References: <20160910053113.99251-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] ass_split: reindent 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/ass_split.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index cdb1aa2..d3e8a8d 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -276,23 +276,23 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) if (section->format_header && !order) { len = strlen(section->format_header); if (buf[len] == ':' && !strncmp(buf, section->format_header, len)) { - buf += len + 1; - while (!is_eol(*buf)) { - buf = skip_space(buf); - len = strcspn(buf, ", \r\n"); - if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) - return NULL; - order = tmp; - order[*number] = -1; - for (i=0; section->fields[i].name; i++) - if (!strncmp(buf, section->fields[i].name, len)) { - order[*number] = i; - break; - } - (*number)++; - buf = skip_space(buf + len + (buf[len] == ',')); - } - ctx->field_order[ctx->current_section] = order; + buf += len + 1; + while (!is_eol(*buf)) { + buf = skip_space(buf); + len = strcspn(buf, ", \r\n"); + if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) + return NULL; + order = tmp; + order[*number] = -1; + for (i=0; section->fields[i].name; i++) + if (!strncmp(buf, section->fields[i].name, len)) { + order[*number] = i; + break; + } + (*number)++; + buf = skip_space(buf + len + (buf[len] == ',')); + } + ctx->field_order[ctx->current_section] = order; goto next_line; } }