aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-21 01:44:18 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-24 07:50:56 +0100
commit3bf07b1a2dfb2a7579f1d4c6ff6d64a444f66be2 (patch)
tree8fc8696965c48a40fe81d702c3422dab0c4cd3bf /libavcodec
parent1c9e53d70b4a0157af02070c2a6cf4db0c6f6dee (diff)
downloadffmpeg-3bf07b1a2dfb2a7579f1d4c6ff6d64a444f66be2.tar.gz
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 <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/bitstream.c4
1 files 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); \
} \
}