From patchwork Sat Jul 18 00:19:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21157 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp42897ybm; Fri, 17 Jul 2020 17:20:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMYJtH9lLeilj/wYWKV2+axgnSD+PuIJcDNEHKduq/ZeD4S6D/A2+OUko8MQALtZ7a1KHL X-Received: by 2002:adf:a4cf:: with SMTP id h15mr13586100wrb.229.1595031656110; Fri, 17 Jul 2020 17:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595031656; cv=none; d=google.com; s=arc-20160816; b=k8kTXiXATQs9bz6fkfvmblCXRnxVDmVgDhVOXnlBO5qOz1Y+b//+kXDaHCmWWBXSJL LSQGKyhHZoPFaz6Yy3UZg4A2DYuV3bSOtmYB5X9dOQxYNhKtp+idHJRsfeesDCkptIWD 3mpDYLJ8iW7c3bUBppr6QGt647ksxBNxpoYU5FFDtwO7XBsA2Fzq26YuORql90r+psOH 2I9RcDXlIeNGpG3gZfJ4tRBMcf4UzaI4yxLIk0+TnXE19Qjxzaqz2hYGpXzLQMcWMUSJ sto1gnpNMV8vm/6t1NjdUl5C8R5wyScQ71014rk2zk6u5SQff0S45UASWiBVo2o9LKgJ GoqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wOJIEo+WFvhXKFUHJ+dcN97Uk/wc50OvnJQC5sLa0rA=; b=NZsWEw/zfQoZi3dX8s8wbBuX3qXtBpm04WiRxV6pPsdKRx4RnYbKE5hKmT74D6QE2V VjvzeMS8UmdWQmcBAeeX6i3UHkNM9T0dbA8vn8eCLgwjKk31dQTj5Yxh1MKaViu6bB3b Ai8bLYdvaNtlupal9Gj44yRhomaWS8JvMdT/fBErSnGOR3m1N8PwJzojEHjAv58e7Jyt gtYMXcfxJJPVvde/9bMubcE8crQ5jtoMwkxNetWFTF0MEGfoLfGj8OCSpZ9XV46OmrUm Z+BNG6HexiPVDg7UhJMaecS4L/1o5uI+7IVQCYMDWJu+NNeNhz8OAA781mqj08s4k7cn WRdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=I+l+Fvv7; 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 y9si8347609wrq.522.2020.07.17.17.20.55; Fri, 17 Jul 2020 17:20:56 -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=I+l+Fvv7; 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 E572168B6F5; Sat, 18 Jul 2020 03:20:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D75368B6E2 for ; Sat, 18 Jul 2020 03:19:56 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id e22so9018193edq.8 for ; Fri, 17 Jul 2020 17:19:56 -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=nRmGZmMkIz0o63GIXDhAmkatk1X1CvFw00VN5S1BVKw=; b=I+l+Fvv7jdBPhCzK2yg74y9OAfpApuVBYMFQ7Xx6im5LUuir3v/0/x9uzhGFl6d4w5 4EeCdSqg25YMXS+ejKO+Q6bIdeBwXEbn6BH9zvFbeGaYj9CsvGGpIEkguTTv1UK0NPuV QMWDPBnQyMhWUHghgcGzaMr8MguvnvD5A8LXwawa3pn2uDiM5u01M5/WX+mXx2CVwB/L z8n/jMcfXgNBtTm5ZWK91kEbzKf2tKlTcMwVDU+glR0wWPBwzMcSho/muA2tNkKmu7Mm v/mWQjEsOT1kKTpZPUbl1rFWmvDpw/h6OxYGMvQd10Wd30JWAtVpU7yhb2GjJ9FGnh1r nGXA== 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=nRmGZmMkIz0o63GIXDhAmkatk1X1CvFw00VN5S1BVKw=; b=kVVEu7u2xBR4klEet3hE/ij/ff+1PPtwxKY5Nj5vOhRA5SgeHZZz4W0iPRZSk+ZhtJ IDjeQATJBvOdvtFVZ4y1Ql/Wt9AZp6DvZNPu/mVUseGlXER2cB3hwNuRgZcEjeFBsBDb 8qnST2qiIzFt053K3HTbhRPMdBe2g6Nh+GqzmHzcEneBlV+lKtz2xZE5fe/9dHBXqrjU sXzT9esW3r8/f+v6TgHdvyYvum7BsDaj41nZ4pZEdGL8B8ZQBEdcrWIE8zT13cnqVD70 e+DVOFoJB2noF2NJcPc/aDbor9M8XPKw3HfLn2qzqpi6n6171Z9GZiGlP1Sg3ezVQ/tD orZw== X-Gm-Message-State: AOAM5317QA3CAFCEWG4CsRftQcC0HAOJMIG91CXtpjaXn3PGh/s3lhhb emHMoqoUIFexvFTqVXq1JiQmbb5Y X-Received: by 2002:a05:6402:1c86:: with SMTP id cy6mr11553158edb.30.1595031595630; Fri, 17 Jul 2020 17:19:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id y7sm9299001ejd.73.2020.07.17.17.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 17:19:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 02:19:26 +0200 Message-Id: <20200718001928.10603-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200718000636.2167-1-andreas.rheinhardt@gmail.com> References: <20200718000636.2167-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] avformat/segafilmenc: Simplify writing two bytes 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" X-TUID: HdyCv0sZhhmD Content-Length: 2043 Use avio_wb16() instead of avio_write() to write two zero bytes. Signed-off-by: Andreas Rheinhardt --- libavformat/segafilmenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c index e144da4e68..d935caf00d 100644 --- a/libavformat/segafilmenc.c +++ b/libavformat/segafilmenc.c @@ -119,7 +119,6 @@ static int film_write_packet(AVFormatContext *format_context, AVPacket *pkt) if (encoded_buf_size != pkt->size && (pkt->size % encoded_buf_size) != 0) { avio_write(pb, pkt->data, pkt->size); } else { - uint8_t padding[2] = {0, 0}; /* In Sega Cinepak, the reported size in the Cinepak header is * 8 bytes too short. However, the size in the STAB section of the header * is correct, taking into account the extra two bytes. */ @@ -127,7 +126,7 @@ static int film_write_packet(AVFormatContext *format_context, AVPacket *pkt) metadata->size += 2; avio_write(pb, pkt->data, 10); - avio_write(pb, padding, 2); + avio_wb16(pb, 0); avio_write(pb, &pkt->data[10], pkt->size - 10); } } else {