From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D75F846571 for ; Tue, 16 Jul 2024 17:18:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88A4968DAEB; Tue, 16 Jul 2024 20:16:48 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".