From patchwork Wed Mar 27 11:18:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhupengfei via ffmpeg-devel X-Patchwork-Id: 12489 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 826FE448F1B for ; Wed, 27 Mar 2019 13:23:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68BC368A9DF; Wed, 27 Mar 2019 13:23:07 +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 786D268A830 for ; Wed, 27 Mar 2019 13:23:04 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id y7so13956563wrn.11 for ; Wed, 27 Mar 2019 04:23:04 -0700 (PDT) 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=suWhlW141qDrZfKHdogL+6UrhRbDx3V8Ux0eOKVU8Eo=; b=rDe4e1hr/g/44V1eKVIJUECNKIXudi4ScFqMid3GXG88IkhVO/WYbcVSHH63yij2d0 hwc2vRLleIJlqHQtZxaQID/NCnEPim4dEuHyS4ShLXP4NRSlp91T29UJRl9uIen6y5oO kv5hZlUBJ8RgL6EXvF25UkyP4k5nLQUw6Bp94oBjV1yxf4EKhnPLDlNixEcZ09R8P2yL amH9DvP0a6f0fy4Ki7Wq1F5kLc6Z6DR+1rZ2lQFMP/ao6Zo3MPK8w2RfzHtVUBinsUxo K94pDnedeZfGq6gn/P49B6MOl4Fosu3p0FEsKYYIr7o7nrd1W+EISm1+RnTeQs5QgRDz azSA== X-Gm-Message-State: APjAAAWjZkGGy+YMb2QjyI2qvTdLNY2v7sVd029jsxy0n+ppbKcL9ZNk Mr1PWaOBDAPiMkmCWdCOMBUY70tkxS4= X-Google-Smtp-Source: APXvYqy2gxhJ740L5mjz4wCQV0mFOlfEzjLI4QUegVjAa2idfl5Y4nAF0NOQKAx6rnJxhQsqKtgKvw== X-Received: by 2002:adf:dc88:: with SMTP id r8mr16752922wrj.28.1553685783862; Wed, 27 Mar 2019 04:23:03 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id h10sm31745448wrs.27.2019.03.27.04.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:23:03 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 12:18:52 +0100 Message-Id: <20190327111852.3784-22-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/21] 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: zhupengfei via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index bd0dfee4db..8243b858da 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1645,7 +1645,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; @@ -2693,7 +2693,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) @@ -3544,8 +3544,8 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) block->discard_padding); } - ebml_free(matroska_blockgroup, block); - memset(block, 0, sizeof(*block)); + ebml_free(matroska_blockgroup, block); + memset(block, 0, sizeof(*block)); } else if (!matroska->num_levels) { if (!avio_feof(matroska->ctx->pb)) { avio_r8(matroska->ctx->pb); @@ -3951,7 +3951,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);