From patchwork Tue Dec 8 23:11:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24445 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 BF54044B6E9 for ; Wed, 9 Dec 2020 01:17:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93A1A689AA2; Wed, 9 Dec 2020 01:17:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D8DC689AA2 for ; Wed, 9 Dec 2020 01:17:30 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id q75so48622wme.2 for ; Tue, 08 Dec 2020 15:17:30 -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:mime-version :content-transfer-encoding; bh=PDPRteGGrGARf1/OLagEDjp0BdEYphEzViUYkhm7nJw=; b=ifpS1ynD2fJUGQEw1XyLSfpTtsnMb+WxlvNhQolk/gl2J42KEle95YMWyezNSuSpuO fjUF01AdVLZ/nc72dJdcRn829C/79WmEqaOu7gcdssrlPmnscf0/0Ye+HKKdXlTAuAWk nHnHtLCxsr85XdM6sghHZHEU77GEFQ+6Dftfd4v4DpB9Th0C9xZRez9SfOaJVvE8H3Ge WidVlWGmF9GjvZ1MKkQ+hQfLcjnmu/LHmpUsmUUeA2BbzuxB9qcpADe/86J8BUOofevI GKvJhu3+t0y6otq9PMYlh0G0Z2xkqi46xWAHgKaP5YkCwT7jA1U4IVOrVuKc+CXNWovM gGlg== 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:mime-version :content-transfer-encoding; bh=PDPRteGGrGARf1/OLagEDjp0BdEYphEzViUYkhm7nJw=; b=bTWqT49hFvhYl727xb48pYSfF/I2bs13zFpBWQANlfSHEdkZskDZ1zdD3lzRofZqUP hagix324qKoz1bZstpolx+oIy9qWCM4NOVheVbZley+1Z5M+klCwP40SCnBlozEGB5V8 nn2yF7EUl+prCihC9TIJEbPXLYa9qR+ttCBfdG4g/UZL76GkauH4vQl398TlboJE9o0G yqLG3XZBsQlNV3GPUDXtGrubUd5LpWss+9iTFgLcbN/N63wIxMishVbZlL5jbXLD6xu+ T7An1MORbHSOpIxMUxMxOwh84k6YvOOELjOHAAookF6Ehfipdsfa4YQpNoI8bXm5onIo fJcw== X-Gm-Message-State: AOAM532j/SEkU8muSxcxZUh9mcS9yqjLRwK7bbGLuj8kmkOvyisLxR95 d6PZOA0b+4LgctYV3xuOAFdqzA3GfMf6NA== X-Google-Smtp-Source: ABdhPJx4XHeiQUBoZfpCa8rHU+1hl7e+19+qZVasQvEu7OAciRMAhcHwoInRt4DLUVxXI0DWSnLxmQ== X-Received: by 2002:a1c:ba44:: with SMTP id k65mr104197wmf.188.1607469116325; Tue, 08 Dec 2020 15:11:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 34sm640811wrh.78.2020.12.08.15.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 15:11:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Dec 2020 00:11:47 +0100 Message-Id: <20201208231147.1572362-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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. This solves this by checking the assert condition outside of the switch and removing the default case. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 7570fb2204..9966323a9b 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -96,6 +96,7 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) #define GET_DATA(v, table, i, wrap, size) \ { \ const uint8_t *ptr = (const uint8_t *)table + i * wrap; \ + av_assert1(size == 1 || size == 2 || size == 4); \ switch(size) { \ case 1: \ v = *(const uint8_t *)ptr; \ @@ -106,8 +107,6 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) case 4: \ v = *(const uint32_t *)ptr; \ break; \ - default: \ - av_assert1(0); \ } \ }