From patchwork Tue Jul 16 17:11:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp442040vqb; Tue, 16 Jul 2024 10:27:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGd5H4JH/s+uHfW2GIRLM2DDH2xVf0sX+LNbvZ1JGLrVw5o9ZvCVuGOiLFairlBRzfkgjdHUZUOcjRqYs2V2GDzwFplMW1CANAEw== X-Google-Smtp-Source: AGHT+IFAMPrK69q+vMBsRCilry+6Z8IgBTc2wPYzn5ONtzA9pMoCLm8yo+z31fDYJokN3qdF5uvq X-Received: by 2002:a17:906:3e44:b0:a77:cf09:9c5b with SMTP id a640c23a62f3a-a79ea454b67mr210723566b.35.1721150820678; Tue, 16 Jul 2024 10:27:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721150820; cv=none; d=google.com; s=arc-20160816; b=Cnhb7q0TWCIrdtV9abK6D42HFAePg3rJOc+ACmEiclNnBf9VGkRSQxV5byHxV+flnY Fy/Me2eRuQUgvCMRN1ST6HOD94UHrWzk9nceOARNLhZSy15cjMaPdbp6c70+iH1gK2nh esDT/Cd757iM5Ttj1iZQHNbC/Ru8LcULS7Ut9Q0i2dALl9XW+2R4JTP6EmU62DdibNJ3 mdyQM5ORtSqKfDtZ1NTyzKHp1V2sR/ndEy9uDm0vD6wIEEWau8A2ISfz3SxvYDtCXFJd 4DGk0MkEUM1QTkjiBiAlGgJE4vR8RsoZL7mS5rE0Fqhh6+sOhAsxBfdXkgqyLRsoa69o iUzQ== 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:dkim-signature:delivered-to; bh=7N5OkN/ysoQBBOXSxjwmGUBJIuP9s0NHuCXhu+UPMV4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uHlYHHW6Lrqiy+i1lXALs4memza6U8vLInYjCXIXQa43myrZiKU8GHwjUwpPRTLzWU ALJR4EpQIWovEQIHnoVYgPhLA4KAiPnN8dKGEiHo0F8rOrJE4GMRFYi6jKQbQjGL5A1X IsBz7P5OJ8wbbkGyGG394/pjLGfreTOq2xU1yxKwoisgd1kEhuFhOKxwJoeOxMtiS/LH 3Wua3uiGlFnp/V0mIg+y79Kj6TJIZeW488toiYt0zaYq83VvlqacCsW4LasjEshdXW5m BdhFpjSLy8M9hCRJlLZrFBonBAsVvrIQsZTQAa3rZFvDOPodEj9uGFsWtOdZJ4coWYQi gxpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=QKJYW0OI; 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 a640c23a62f3a-a79bc58b0cdsi410671966b.94.2024.07.16.10.27.00; Tue, 16 Jul 2024 10:27:00 -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=@khirnov.net header.s=mail header.b=QKJYW0OI; 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 C6E8468DAEC; Tue, 16 Jul 2024 20:16:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB65368D918 for ; Tue, 16 Jul 2024 20:16:31 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=QKJYW0OI; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 8F20B998 for ; Tue, 16 Jul 2024 19:16:31 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id PXtB_Fb9UQax for ; Tue, 16 Jul 2024 19:16:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150187; bh=nSos1tdSmy4gmgr2wyPKIClIyLAzxkNLX6pmTE/fglw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QKJYW0OIVDVqAKuVmKnlUl5JHsflgWugkWIAs6rgmEVsrjDWnZp+fU+Vc4ZaKHR8e hJPGq32nizRAL4G7J2/StxOhKOS+1XXq1gC+J0UUsdb40fDG/bRRr9qCdLKmCiKJid /ve8Z1QLEpLObS0biieZ+0Yw1nYAn77Gx+EYbe6B5YpY02CkDW2lqUyPxrhcKwuyg8 THKLZcDUgLQ6nFbQYSbQNc8WI3JBUhifmkF6Pzfx8CnooWUVC+20+fv9Nyo7Ln3QYc 8fdl30HrjzUHE7ZJmOJ99XavLnXRo5paitfubmDm01uPw3Y6y3zPcFc9qXu+NsIFlD nx2cTuV59p2Rw== 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 mail1.khirnov.net (Postfix) with ESMTPS id C90D24DBA for ; Tue, 16 Jul 2024 19:16:26 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6024D3A09EE for ; Tue, 16 Jul 2024 19:16:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:20 +0200 Message-ID: <20240716171155.31838-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/39] lavc/ffv1dec: drop a pointless variable in decode_slice() 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: n4FVnrjERt37 fsdst is by construction always equal to fs, there is even an av_assert1() checking that. Just use fs directly. --- libavcodec/ffv1dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 60d04f04b9..dbb7e082a3 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -267,16 +267,14 @@ static int decode_slice(AVCodecContext *c, void *arg) if(f->fsrc && !(p->flags & AV_FRAME_FLAG_KEY)) { FFV1Context *fssrc = f->fsrc->slice_context[si]; - FFV1Context *fsdst = f->slice_context[si]; - av_assert1(fsdst->plane_count == fssrc->plane_count); - av_assert1(fsdst == fs); + av_assert1(fs->plane_count == fssrc->plane_count); if (!(p->flags & AV_FRAME_FLAG_KEY)) - fsdst->slice_damaged |= fssrc->slice_damaged; + fs->slice_damaged |= fssrc->slice_damaged; for (int i = 0; i < f->plane_count; i++) { PlaneContext *psrc = &fssrc->plane[i]; - PlaneContext *pdst = &fsdst->plane[i]; + PlaneContext *pdst = &fs->plane[i]; av_free(pdst->state); av_free(pdst->vlc_state);