From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 404E14D40C for ; Sat, 31 May 2025 20:59:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 800B568DEEA; Sat, 31 May 2025 23:59:45 +0300 (EEST) Received: from sender2-op-o11.zoho.eu (sender2-op-o11.zoho.eu [136.143.171.11]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E974568DE71 for ; Sat, 31 May 2025 23:59:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1748725174; cv=none; d=zohomail.eu; s=zohoarc; b=SxmRVS+nTYE0gVccfo/kXVhJAKx66e8pVWGJrF0ukcAGNe31YaRC2G11IWnqg1cyfDA3OCQSKCnaPln9lNWr3pzL4ewBBUEMV8b92HjHDmrM82YOVtU/P8ZV7XxFB9g/1oQpisz408/4wQES00yEtmQuhYQbjfj+dteathO4s9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1748725174; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=p4JoaJ7SZLDWjWFGkV5y5/VaLfWREcYabhaH5Bbseso=; b=D7g+00Jn/8cgaGyMlHDytB/157Ekin01Y3wHUQAMDNQivHs+mZzA6Ff5w+rvNL+/DHK3FRYk46/eisVqfCggk1QEsAEUtjmPiHEdqI56SJOUQTs/soaLlW7r8u0ed7fUWHn/bY/ScKTw4rsb03FaAocBr7RQZnAPQd9H3d9SeYI= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748725174; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=p4JoaJ7SZLDWjWFGkV5y5/VaLfWREcYabhaH5Bbseso=; b=NgS6C/6d1roju15QVaX7MmoqdFk7Rwc9/wiHqIfWkFbiA0kppFG+KH4VyvXtCpJU 3HjaVznf9YSy58v/We8McTnqj110yUjtQGgVTyaORm32G8Hc6R8vyJu4b3dJ9zd/F9D UaqTvwCX0fQlyd60RtjLfEQtj5Vfa4PXkA+X3Hfs= Received: by mx.zoho.eu with SMTPS id 174872517361342.51911257354732; Sat, 31 May 2025 22:59:33 +0200 (CEST) From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 May 2025 21:58:53 +0100 Message-ID: <20250531205926.81040-1-post@frankplowman.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Fix unchecked return code and shadowing 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 Cc: Frank Plowman , nuomi2021@gmail.com, toqsxw@gmail.com 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: Signed-off-by: Frank Plowman --- libavcodec/vvc/dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index deb1b07b23..ac3f453440 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -1160,7 +1160,7 @@ fail: static int frame_end(VVCContext *s, VVCFrameContext *fc) { const AVFilmGrainParams *fgp; - int ret = 0; + int ret; if (fc->ref->needs_fg) { av_assert0(fc->ref->frame_grain->buf[0]); @@ -1172,9 +1172,13 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc) case AV_FILM_GRAIN_PARAMS_H274: ret = ff_h274_apply_film_grain(fc->ref->frame_grain, fc->ref->frame, &s->h274db, fgp); + if (ret < 0) + return ret; break; case AV_FILM_GRAIN_PARAMS_AV1: ret = ff_aom_apply_film_grain(fc->ref->frame_grain, fc->ref->frame, fgp); + if (ret < 0) + return ret; break; } } @@ -1182,7 +1186,7 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc) if (!s->avctx->hwaccel && s->avctx->err_recognition & AV_EF_CRCCHECK) { VVCSEI *sei = &fc->sei; if (sei->picture_hash.present) { - int ret = ff_h274_hash_init(&s->hash_ctx, sei->picture_hash.hash_type); + ret = ff_h274_hash_init(&s->hash_ctx, sei->picture_hash.hash_type); if (ret < 0) return ret; -- 2.47.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".