From patchwork Tue Sep 8 18:09:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 22174 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AAC2044ABD7 for ; Tue, 8 Sep 2020 21:09:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A5BA68B606; Tue, 8 Sep 2020 21:09:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B01A268B40C for ; Tue, 8 Sep 2020 21:09:44 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 088I9hBW015442 for ; Tue, 8 Sep 2020 20:09:43 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 835E6E00EA; Tue, 8 Sep 2020 20:09:43 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Sep 2020 20:09:42 +0200 Message-Id: <20200908180942.1309330-1-george@nsup.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Tue, 08 Sep 2020 20:09:44 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH] lavfi/buffersink: cast to uint64_t before shifting. 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" Fix CID 1466666. Signed-off-by: Nicolas George --- libavfilter/buffersink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 9338969bf1..58848941d4 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -72,10 +72,10 @@ static void cleanup_redundant_layouts(AVFilterContext *ctx) for (i = 0; i < nb_counts; i++) if (buf->channel_counts[i] < 64) - counts |= 1 << buf->channel_counts[i]; + counts |= (uint64_t)1 << buf->channel_counts[i]; for (i = lc = 0; i < nb_layouts; i++) { n = av_get_channel_layout_nb_channels(buf->channel_layouts[i]); - if (n < 64 && (counts & (1 << n))) + if (n < 64 && (counts & ((uint64_t)1 << n))) av_log(ctx, AV_LOG_WARNING, "Removing channel layout 0x%"PRIx64", redundant with %d channels\n", buf->channel_layouts[i], n);