virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/iff: Use unsigned to avoid compiler warning

Browse Source 
GCC 12 apparently believes that negative palette sizes are
possible (they are not, as this has already been checked during
init) and therefore emits a -Wstringop-overflow= for the memcpy.
Using unsigned avoids this.
(To be honest, there might be a compiler bug involved.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-07-11 20:52:48 +02:00
parent 487fc61cb2
commit 4cd1d3e3b7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/iff.c
View File

@@ -151,9 +151,10 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) {
static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{ {
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
int count, i; unsigned count, i;
const uint8_t *const palette = avctx->extradata + AV_RB16(avctx->extradata); const uint8_t *const palette = avctx->extradata + AV_RB16(avctx->extradata);
int palette_size = avctx->extradata_size - AV_RB16(avctx->extradata); /* extract_header() already checked that the RHS is >= 0. */
unsigned palette_size = avctx->extradata_size - AV_RB16(avctx->extradata);
if (avctx->bits_per_coded_sample > 8) { if (avctx->bits_per_coded_sample > 8) {
av_log(avctx, AV_LOG_ERROR, "bits_per_coded_sample > 8 not supported\n"); av_log(avctx, AV_LOG_ERROR, "bits_per_coded_sample > 8 not supported\n");