From patchwork Sun Feb 21 01:41:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25854 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 220E3449C88 for ; Sun, 21 Feb 2021 03:41:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07B4D68A72F; Sun, 21 Feb 2021 03:41:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18FAD68089B for ; Sun, 21 Feb 2021 03:41:43 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id n10so11157267wmq.0 for ; Sat, 20 Feb 2021 17:41:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RH4RLbrwaSmXDFy65Ie5tEHm6kYGQO1yW3VZo1tYPMs=; b=C5ufb5clNW/ILnWWmANm0lCo5iHnKTh/x3MJQ6ZX5irdx3oJke7mZAdzMu/Tx0MGwM zD8cyZllBSnOVvP3HuriGd2uVr8tCAgdMLqvZ7y2T4KRbdy9hgYpII8W3JJwMbf7ywlo uz6IRNgAWPqCT72f5up1Yh9GOFCALYySKP8WnmxnIb/78+aNdgjNBroSOn9jTL4T14XV VlM3vv5hS+v/k8IkWdl6C8ExHfPNGIptECHa5YW3Ou4UesrZCTi1g8sL9IgvBCG9lkxx +BfeAwOG8TL0xLv0GvRv8/uEVIPal12M80Tq6b/lkjLk3+PRhZRQfhAV+G9PxLkoLcyW hssg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RH4RLbrwaSmXDFy65Ie5tEHm6kYGQO1yW3VZo1tYPMs=; b=nFJ0U05LD9eSzBv2dBu8FRYFb9cFuTWEVuuGCnHEZZfT7MR2Q6sPrP5nGfip2P46zE 8FPdG+bpvtYABSyMphBzsgF2kGVcigb5SFofz8t9HN61/Iv71R4kukiV/0kd+hlrNM1l 2TD9Ij1zgtscoXbXoNB38ksKSKdC8GrpOQB8/I6d2vmAVa5Ejhs43S/Hc4GNTmfy1PVN sWG+xnS4gHTdzTu7IyKGG4mFDhfs1Mhc8e+/60E1gy0Z6ewvXfafCAE3d448A2uTryp8 u9tKeWEtXTb1jeZQP5HLk2MZHIXOdk2Y0+brREzDIlWXYLIjGb5jAN6iwsGDA8owdnBD nT1A== X-Gm-Message-State: AOAM5330Tiq/yILclbuPq0TIHkguw8hp4IPG58gVZm+J6WURUMoiAfDa aCpJcbNWpecYzOvAtPHm398t+A0JSzI= X-Google-Smtp-Source: ABdhPJxj8t8KnYvA1SnMqs+UJMZRAJAYCKvzrWUWR1++NCk3pRaW7fbMzbccL56OAttr2IrbTPseyg== X-Received: by 2002:a1c:80c6:: with SMTP id b189mr14446380wmd.21.1613871702529; Sat, 20 Feb 2021 17:41:42 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z66sm20195597wmg.39.2021.02.20.17.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Feb 2021 17:41:42 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 02:41:00 +0100 Message-Id: <20210221014100.195627-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210221014100.195627-1-andreas.rheinhardt@gmail.com> References: <20210221014100.195627-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/bitstream: Rewrite code to avoid triggering compiler warning 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Clang infers from the existence of a default case that said case can be taken. In case of libavcodec/bitstream.c said default case consisted of an av_assert1 that evaluates to nothing in case of the ordinary assert level. In this case (that doesn't happen) a variable wouldn't be initialized, so Clang emitted Wsometimes-uninitialized warnings. Solve this by making sure that the default path also initializes the aforementioned variable. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 7570fb2204..e425ffdc96 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -104,10 +104,10 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) v = *(const uint16_t *)ptr; \ break; \ case 4: \ + default: \ + av_assert1(size == 4); \ v = *(const uint32_t *)ptr; \ break; \ - default: \ - av_assert1(0); \ } \ }