From 3bf07b1a2dfb2a7579f1d4c6ff6d64a444f66be2 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 21 Feb 2021 01:44:18 +0100 Subject: [PATCH] avcodec/bitstream: Rewrite code to avoid triggering compiler warning 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. Reviewed-by: Paul B Mahol 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); \ } \ }