From patchwork Sun Mar 5 18:33:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: u-9iep@aetey.se X-Patchwork-Id: 2756 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp1101576vsf; Sun, 5 Mar 2017 10:33:31 -0800 (PST) X-Received: by 10.223.160.231 with SMTP id n36mr12874371wrn.167.1488738811437; Sun, 05 Mar 2017 10:33:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v13si23397057wrv.32.2017.03.05.10.33.31; Sun, 05 Mar 2017 10:33:31 -0800 (PST) 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=@fripost.org; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C27CA6882D3; Sun, 5 Mar 2017 20:33:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from outgoing.fripost.org (giraff.fripost.org [178.16.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D57F66809ED for ; Sun, 5 Mar 2017 20:33:09 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by outgoing.fripost.org (Postfix) with ESMTP id 0099BAD0617 for ; Sun, 5 Mar 2017 19:33:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fripost.org; h= in-reply-to:content-disposition:content-type:content-type :mime-version:references:message-id:subject:subject:from:from :date:date; s=20140703; t=1488738801; x=1490553202; bh=9lWrJ99Cq FI2n/2NUP2nJMqFE1mlm3OArM5yqb8pwsY=; b=AKJDs0Ka6ZWv14KjxXrTxFtd8 MQ08Pz5hV8kYSYuSnPh7SlSIFvwS/fuOonxUMWgpNrHWNVxhn/tf26FpgJFFambm wkT/IKWbuBou2au/QK4u2mg+sladdEWjEgTBuPGy4W9EXI25dj0nKPL84O12q0pP QBG3rXxSyM9U8CAYEk= X-Virus-Scanned: Debian amavisd-new at fripost.org Received: from outgoing.fripost.org ([127.0.0.1]) by localhost (giraff.fripost.org [127.0.0.1]) (amavisd-new, port 10040) with LMTP id uj7OZOUqa7os for ; Sun, 5 Mar 2017 19:33:21 +0100 (CET) Received: from smtp.fripost.org (unknown [172.16.0.6]) by outgoing.fripost.org (Postfix) with ESMTP id D6846AD0610 for ; Sun, 5 Mar 2017 19:33:21 +0100 (CET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by smtp.fripost.org (Postfix) with ESMTPSA id 812E22A96923 for ; Sun, 5 Mar 2017 19:33:21 +0100 (CET) Received: (qmail 14219 invoked from network); 5 Mar 2017 18:32:01 -0000 Received: from localhost (HELO aetey.se) (eh1ba719@127.0.0.1) by mail with ESMTPA; 5 Mar 2017 18:32:01 -0000 Date: Sun, 5 Mar 2017 19:33:04 +0100 From: u-9iep@aetey.se To: FFmpeg development discussions and patches Message-ID: <20170305183304.GM32749@example.net> References: <20170213175139.GB32749@example.net> <20170214065146.0810cb48@debian> <20170214085154.GD32749@example.net> <20170214100003.013390c4@debian> <20170214111404.GE32749@example.net> <20170215110155.GG32749@example.net> <20170225200358.GG32749@example.net> <20170305182630.GL32749@example.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170305182630.GL32749@example.net> Subject: [FFmpeg-devel] [PATCH 2/2] (was Re: deduplicated [PATCH] Cinepak: speed up decoding several-fold...) formats. 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" Whitespace adjustments only. Regards, Rune From 664e8878aac9dd9fa0393a1d60de81df8bf2f195 Mon Sep 17 00:00:00 2001 From: Rl Date: Sun, 5 Mar 2017 16:32:58 +0100 Subject: [PATCH 2/2] libavcodec/cinepak.c: small whitespace cleanups --- libavcodec/cinepak.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index d8bc7860eb..8434eaf35c 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -146,12 +146,12 @@ static int cinepak_decode_vectors_##pixel_format (CinepakContext *s, cvid_strip for (x=strip->x1; x < strip->x2; x+=4) {\ if (selective_update && !(mask >>= 1)) {\ if ((data + 4) > eod) return AVERROR_INVALIDDATA;\ - flag = AV_RB32 (data); data += 4; mask = 0x80000000;\ + flag = AV_RB32 (data); data += 4; mask = 0x80000000;\ }\ if (!selective_update || (flag & mask)) {\ if (!v1_only && !(mask >>= 1)) {\ if ((data + 4) > eod) return AVERROR_INVALIDDATA;\ - flag = AV_RB32 (data); data += 4; mask = 0x80000000;\ + flag = AV_RB32 (data); data += 4; mask = 0x80000000;\ }\ if (v1_only || (~flag & mask)) {\ POINTER_TYPE *p;\ @@ -310,7 +310,7 @@ static int cinepak_decode_strip (CinepakContext *s, cvid_strip *strip, const uint8_t *data, int size) { const uint8_t *eod = (data + size); - int chunk_id, chunk_size; + int chunk_id, chunk_size; /* coordinate sanity checks */ if (strip->x2 > s->width || @@ -426,7 +426,7 @@ static int cinepak_decode (CinepakContext *s) return result; s->data += strip_size; - y0 = s->strips[i].y2; + y0 = s->strips[i].y2; } return 0; }