virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_paletteuse: Fix left shift outside of range of int

Browse Source 
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>
(cherry picked from commit 797c2ecc8f)
This commit is contained in:
Andreas Rheinhardt 2020-01-22 01:47:21 +01:00 committed by Andreas Rheinhardt
parent da4b64ea02
commit 28dd12c9b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_paletteuse.c
View File

@ -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)));