[FFmpeg-devel] [PATCH 2/4] avfilter/vf_paletteuse: Fix left shift outside of range of int

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Fri Mar 26 19:50:09 EET 2021


Andreas Rheinhardt:
> 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 at gmail.com>
> ---
>  libavfilter/vf_paletteuse.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
> index ed128813d6..c9603601aa 100644
> --- a/libavfilter/vf_paletteuse.c
> +++ b/libavfilter/vf_paletteuse.c
> @@ -158,9 +158,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)));
> 
Will apply.

- Andreas


More information about the ffmpeg-devel mailing list