diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-01-22 01:47:21 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-03-28 18:47:15 +0200 |
| commit | 797c2ecc8fca65721b79637073df0a31fe31c463 (patch) | |
| tree | 33a4418fea7739b23d9c30e500b1e6d6784d0795 /libavfilter/vf_paletteuse.c | |
| parent | 55b46902c1f855d02ea802de1285d68577a38806 (diff) | |
| download | ffmpeg-797c2ecc8fca65721b79637073df0a31fe31c463.tar.gz | |
avfilter/vf_paletteuse: Fix left shift outside of range of int
by keeping the variable uint32_t which in this situation is the natural
type anyway. This affected the FATE-test filter-paletteuse-sierra2_4a.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavfilter/vf_paletteuse.c')
| -rw-r--r-- | libavfilter/vf_paletteuse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index fc07c2581d..f4c7d60435 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -152,9 +152,10 @@ static int query_formats(AVFilterContext *ctx) return 0; } -static av_always_inline int dither_color(uint32_t px, int er, int eg, int eb, int scale, int shift) +static av_always_inline uint32_t dither_color(uint32_t px, int er, int eg, + int eb, int scale, int shift) { - return av_clip_uint8( px >> 24 ) << 24 + return px >> 24 << 24 | av_clip_uint8((px >> 16 & 0xff) + ((er * scale) / (1<<shift))) << 16 | av_clip_uint8((px >> 8 & 0xff) + ((eg * scale) / (1<<shift))) << 8 | av_clip_uint8((px & 0xff) + ((eb * scale) / (1<<shift))); |