From patchwork Fri Mar 8 09:26:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12252 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 8A25F44903F for ; Fri, 8 Mar 2019 11:27:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7771968A7CA; Fri, 8 Mar 2019 11:27:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6314F68A76A for ; Fri, 8 Mar 2019 11:27:37 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id d17so20560803wre.10 for ; Fri, 08 Mar 2019 01:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RY/5Oe5hLWluLk/q3GiKGwrVo4AQTOTfJq2Fy+b8P/o=; b=d3XkL5Nj4U4Lz9DltzBrqE4mLT8f6z4gCsa4+bMc1BnVoU3evZJSfug/13l512OBC/ rSWLAP54UyjJkBlBhwVCNFpe88FmwTmd8daLFLyFaVNh667E13lDhxCBjoRMnL3clERL Cy4h6MoTVmC4lphbiwzheeeCwltabBc2++OEsjdiX13KvVojsuo2JGzQRNw1ddyjoDdP FpgBJOdgnU1LJdwKKI8bgoEvvH/NPI0jV9/9zlUBrjrWdPT0tO9KxyFPSqS/QhEaXMRd BXH41OAYpcSxAl23IUE+aEpFwQomx++4DVlChwbl2wIxgilDMKdtS9VseNiv9jtaPwaU +lHg== 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=RY/5Oe5hLWluLk/q3GiKGwrVo4AQTOTfJq2Fy+b8P/o=; b=tR9ezpc1k3Qq10gAH1td1afmsQlG4sP699hRPN7eUKCaDuaE8dJbDjepl9CCk+4GMy O9LqJI7WziNAzIl3fRI5qhD285i6fZ99w+zInVB8ZoOTeCNEJGfVlx2645zKXqQbgI/b pDnzOnFaKWx7g3OwXoLm7kH5F0AzaukETKBRsGr7IrpToJgrYuuOqEQCwBdOkc5YJzQh r5uM5Zm+WbbI1zXTL/JpE5x3GC6V+TEmV0FXSbVKV4OVaiCWEC5Wu+S0cep+J9atTFj+ KraS34oNH521xC1tgNTtRHbd8BxOlOXNwl/auwdDF3nsT5sVQfsvZ1sHNHwDMm7eQS4S YSUA== X-Gm-Message-State: APjAAAXnS99LFryx+WvrwUdqY+4bzl/Gmt6izcWwA3H2CzJnUcy8JBmW t1tkvvOVTZ0+35pSj0fqHk3GvS5b1MU= X-Google-Smtp-Source: APXvYqwJuC1cw52IeAme1RcobUtGDuymve3tea0ttAvBbS57sFrYOoFf8IlNdbFkUdaHPrBJIAOFjw== X-Received: by 2002:a5d:510b:: with SMTP id s11mr10607720wrt.131.1552037256736; Fri, 08 Mar 2019 01:27:36 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id v20sm12179825wmj.2.2019.03.08.01.27.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 01:27:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2019 10:26:04 +0100 Message-Id: <20190308092604.3752-11-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/matroskadec: Typos and 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6c796e8a4a..0f04389a4e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1571,7 +1571,7 @@ static void matroska_convert_tags(AVFormatContext *s) static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, uint64_t pos) { - uint32_t saved_id = matroska->current_id; + uint32_t saved_id = matroska->current_id; int64_t before_pos = avio_tell(matroska->ctx->pb); MatroskaLevel level; int64_t offset; @@ -2625,7 +2625,7 @@ static int matroska_read_header(AVFormatContext *s) /* The next thing is a segment. */ pos = avio_tell(matroska->ctx->pb); res = ebml_parse(matroska, matroska_segments, matroska); - // try resyncing until we find a EBML_STOP type element. + // try resyncing until we find an EBML_STOP type element. while (res != 1) { res = matroska_resync(matroska, pos); if (res < 0) @@ -3458,19 +3458,19 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) } if (!res && block->bin.size > 0) { - int is_keyframe = block->non_simple ? block->reference == INT64_MIN : -1; - uint8_t* additional = block->additional.size > 0 ? - block->additional.data : NULL; - if (!block->non_simple) - block->duration = 0; - res = matroska_parse_block(matroska, block->bin.buf, block->bin.data, - block->bin.size, block->bin.pos, - matroska->current_cluster.timecode, - block->duration, is_keyframe, - additional, block->additional_id, - block->additional.size, - matroska->current_cluster_pos, - block->discard_padding); + int is_keyframe = block->non_simple ? block->reference == INT64_MIN : -1; + uint8_t* additional = block->additional.size > 0 ? + block->additional.data : NULL; + if (!block->non_simple) + block->duration = 0; + res = matroska_parse_block(matroska, block->bin.buf, block->bin.data, + block->bin.size, block->bin.pos, + matroska->current_cluster.timecode, + block->duration, is_keyframe, + additional, block->additional_id, + block->additional.size, + matroska->current_cluster_pos, + block->discard_padding); } ebml_free(matroska_blockgroup, block); @@ -3869,7 +3869,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) // cues end av_dict_set_int(&s->streams[0]->metadata, CUES_END, cues_end, 0); - // if the file has cues at the start, fix up the init range so tht + // if the file has cues at the start, fix up the init range so that // it does not include it if (cues_start <= init_range) av_dict_set_int(&s->streams[0]->metadata, INITIALIZATION_RANGE, cues_start - 1, 0);