From patchwork Wed Sep 19 17:18:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 10418 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp948100jap; Wed, 19 Sep 2018 10:19:09 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYRuKMGnCTXCbMDqV4Z8YdwTmWwiRoNiCM2ed52NET1/J+Knc8OMMlHqnOY4RQn13siCyqB X-Received: by 2002:adf:a644:: with SMTP id k62-v6mr29396857wrc.78.1537377549630; Wed, 19 Sep 2018 10:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537377549; cv=none; d=google.com; s=arc-20160816; b=DzrzodfSiwlUoHa5UfWIv96wmH6Dk5s8m1fhWVie8B79xtF3ufVwj3CVOo2X4y7gf4 +7bGW2glgPGuDeYE/AWs2F8ZOq01m6jRaZitZa5howVTtdFHUYjnz9cV5ZbNE3KndNTX ZmJxFHx+xj9yqSytHoaZfUAofEDT88wknUqEq9Bzpq5TNz6rSPI9D4hJ4XWtK1+L1Qj4 8DBk0Q4d90+AO4C+fAKo8HvIRBR98tH42qqZEgNT8//OcaiI2yaPvI4VDuhmHF+wlaj9 bMTN6ujNCKorKp5Tic/PtJ8/FX6n4rEWWK/en4yFoFTjVjpJY/PeGNO3rUT/svXLmltk UvQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=YoQ7OXghAiR9+o+4JH7D0UTOWjA+a+Fkb2B3YoiQtD4=; b=juHiIDaXl2kT9ZyRdOAMh/dEoc9lf4b5tGJJlY/NAahaa8RKlNhBvNA+oKGN1QzvCC 9EB17Q/aP/5oLziD+3aoQMZRFkPLJe7G0WdkEftuQYvuJfNZ2i1IR48ZapPbkq3yLfcF pKgbh2AqTivVofbpxBBLIixW510fPJsXUeSTn/nL2ZeKd9xclL0thzzLow2IGM0Uwa49 BP55jOZxFbQAkMWaHOPk6Xyf+u/gE1y/w0ppry01aNd61Cx8CiAoaG0OhqlRL7SkLyuI xK2HiIB0dV4t9GvdAu58VFAZiVN2MPMzTUkYkib6JyTZ0/TZy43MDuORaVeKSLpPVCQb HGOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oOScgjZH; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l1-v6si317685wra.6.2018.09.19.10.19.08; Wed, 19 Sep 2018 10:19:09 -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 header.s=20161025 header.b=oOScgjZH; 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 sp=QUARANTINE 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 8838868A669; Wed, 19 Sep 2018 20:18:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0684E68A624 for ; Wed, 19 Sep 2018 20:18:47 +0300 (EEST) Received: by mail-io1-f41.google.com with SMTP id u12-v6so93279ioc.11 for ; Wed, 19 Sep 2018 10:19:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=kNokuXs9f/XAZg9fxWKZCGomiUM64YvpQVeVL1IJRIY=; b=oOScgjZHojw25YLm27KhD3AL5mk3DQHdKCrosTCNCFX9tVDX6ln7125dBXOuCx/wkh PrroeIw7MYC+QqpyeunzlDHileDwsvz5UMSmTLPUpHzPktXe5TuGRtehHObcctTuKPIB 9n4qiYxwrz8sJn0h+W/vX+euo7Hl3RqIpLp9072rGLLX6b8ETNbSffv5EsE4S0pZAkBl sQF3Y03qKwhCmBXHRsxGHupj1jwwqiyvBaCwnV/HWfoG/FklCH8yFH5mP4JVmjy3lhhn a+e3x+iBT1yqHED2TKPyCtuXoDT2uPtonKUdmWTRM6Wc8XRoDSxdYYpzOE9OB1LhhoLu FUKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=kNokuXs9f/XAZg9fxWKZCGomiUM64YvpQVeVL1IJRIY=; b=HNojoetANAxBF/DEiysXQydUp9ip//UZ9NkkFqFYNuhcXhM6g4PLsfQnkyEe0wF6zL yTKzkuUl8LoqN7C7LNelm0qFC8vE5kQOPkBDpNpSy9onvE0UvwCV/IoFO7IUjbrW1y5L AP6WiDLpY/n0jMJIyI2y60Nk1r+kEBjRkfJEN67VYXlbHDmuZSjwxVS/5KwdE5jmBsj3 gEw4DiYlm3W5Cow/KEQiRbcbqiHB1bVoPPI+It8Kjsx/K3/b/CZ+1BJGHNVSoQ+fXAiU SnpB++10ICDxoQTmGWieNcmIiaTjJMScMwWlO7kDiXOqGdFWyjLmETHrDGPC0CSiJchz CK0w== X-Gm-Message-State: APzg51B5nGgxDNsjhfEOSwAkbPynXXx2bM0eVNV9TmQwoKHatFS1JNfu lvDas9wrUSg7/vn7RGF0MUttOeNpyMwyDF4Q7D0Dgg== X-Received: by 2002:a6b:b305:: with SMTP id c5-v6mr30192130iof.49.1537377538951; Wed, 19 Sep 2018 10:18:58 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:731c:0:0:0:0:0 with HTTP; Wed, 19 Sep 2018 10:18:58 -0700 (PDT) From: Carl Eugen Hoyos Date: Wed, 19 Sep 2018 19:18:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/matroskadec: Simplify string length calculation slightly 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch removes useless sizeof's, we require sizeof(char)==1 afaict. Please comment, Carl Eugen From 8384c2097976ce8546d1b73ce822851a6f608813 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 3 Sep 2018 14:18:02 +0200 Subject: [PATCH] lavf/matroskadec: Simplify string length calculation. FFmpeg relies on sizeof(char) == 1. --- libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e679398..2daa1db 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3931,11 +3931,11 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) // store cue point timestamps as a comma separated list for checking subsegment alignment in // the muxer. assumes that each timestamp cannot be more than 20 characters long. - buf = av_malloc_array(s->streams[0]->nb_index_entries, 20 * sizeof(char)); + buf = av_malloc_array(s->streams[0]->nb_index_entries, 20); if (!buf) return -1; strcpy(buf, ""); for (i = 0; i < s->streams[0]->nb_index_entries; i++) { - int ret = snprintf(buf + end, 20 * sizeof(char), + int ret = snprintf(buf + end, 20, "%" PRId64, s->streams[0]->index_entries[i].timestamp); if (ret <= 0 || (ret == 20 && i == s->streams[0]->nb_index_entries - 1)) { av_log(s, AV_LOG_ERROR, "timestamp too long.\n"); @@ -3944,7 +3944,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) } end += ret; if (i != s->streams[0]->nb_index_entries - 1) { - strncat(buf, ",", sizeof(char)); + strncat(buf, ",", 1); end++; } } -- 1.7.10.4