From patchwork Mon May 31 07:54:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 28009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2657834iof; Mon, 31 May 2021 00:59:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGKTfzfyQyFB4M42AzgdBnybseRZ5rB4yTyy7jobIdouvGnksjER6EXzMsmvypypOLNQat X-Received: by 2002:a17:906:dc92:: with SMTP id cs18mr5223559ejc.327.1622447948206; Mon, 31 May 2021 00:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622447948; cv=none; d=google.com; s=arc-20160816; b=Hsf3xtML/P5Y3rL5qtm951YiOMaKSrCbwIq90fWEFtdVdOckFMAuSgiFYYmVxc20n0 +CTqA7ePNQOtrzPdTw3oEkQqTM/NJFX665dg4dUsKT9zf2+xw+QE39gC9wxOUWOa3QVN /JLGjglttZ+cEIAn+5r49yWx6onNpLifM6c2SPvGwhfUEBXpbJAo71rjFCrlYd+nxgvK gGeyQIlmZxmtVV4oPQ1Ep9S1P3kSZMhErrHHB1Hl4GO0hgQBtXX405wlksADC8MsQjLT wTC3ad/vwUqS4RwRLdeasaq7lGEiWS7F7d+QxWNog4clQ933pWsLF1hPtoe+gkUGFH3q BJsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=T9fmO54Bj7g2/GUCK++iZHchw+T/JMBj/x3gPGdxVh0=; b=bHEPvZsxW9NVBjv88gQpmgOvL/mGVAwVkxAWn8YBIGAyp93gkWOiCGyuA22iZTgMw5 KbmDW+K4noeRWXW/Hw2IXny6WN0cocBZgAyLcfXax/pVlDNIQuzyN8kik/DDVLQH1q7G RAQs16vfOoUbsVg80ALbG25piFiTcgFMxBh/PpZCWbp1qtJnfQsiBcU4CUXJHzTdg20x cIzX4TjA6WyRTad4u5ALvCNlJk7X8v1nbpuSy73I6EpJFBytKFrb/mQzOLWfr09JioND 2xfe0wneCjXXQFMKQReoPgd1+VV3LAGlSUnwZy6YWE/grurl4M3YZ8yTnTlpk5FosE6f suFA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l23si15035847ejb.573.2021.05.31.00.59.07; Mon, 31 May 2021 00:59:08 -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; 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 6BC54689B62; Mon, 31 May 2021 10:55:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CB2C6883BF for ; Mon, 31 May 2021 10:55:28 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B3328240696 for ; Mon, 31 May 2021 09:55:24 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id UkDXjGplLxp0 for ; Mon, 31 May 2021 09:55:24 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E1DDA240692 for ; Mon, 31 May 2021 09:55:21 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id ED9ED3A1421; Mon, 31 May 2021 09:55:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 May 2021 09:54:59 +0200 Message-Id: <20210531075515.19544-8-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531075515.19544-1-anton@khirnov.net> References: <20210531075515.19544-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/24] sws: cosmetics X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: seK9TXcyNbu/ Reindent after previous commit, rewrap long lines. --- libswscale/swscale.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 867995c9c7..7dbe0f59c5 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -847,15 +847,15 @@ static int scale_cascaded(SwsContext *c, int srcSliceY, int srcSliceH, uint8_t * const dst[], const int dstStride[]) { - int ret = sws_scale(c->cascaded_context[0], + int ret = sws_scale(c->cascaded_context[0], srcSlice, srcStride, srcSliceY, srcSliceH, c->cascaded_tmp, c->cascaded_tmpStride); - if (ret < 0) - return ret; - ret = sws_scale(c->cascaded_context[1], - (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, 0, c->cascaded_context[0]->dstH, - dst, dstStride); + if (ret < 0) return ret; + ret = sws_scale(c->cascaded_context[1], + (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, + 0, c->cascaded_context[0]->dstH, dst, dstStride); + return ret; } /**