Message ID | 20190928022610.5903-1-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Commit | 4294dc3589a3ab973b10a85b576ff15e3ffb000d |
Headers | show |
lgtm On 9/28/19, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: > Affected every usage of vf_xbr, e.g. the FATE-tests filter-2xbr, > filter-3xbr, filter-4xbr. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavfilter/vf_xbr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c > index 2c71871d22..87810c88f1 100644 > --- a/libavfilter/vf_xbr.c > +++ b/libavfilter/vf_xbr.c > @@ -395,7 +395,7 @@ static int init(AVFilterContext *ctx) > int startg = FFMAX3(-bg, -rg, 0); > int endg = FFMIN3(255-bg, 255-rg, 255); > uint32_t y = (uint32_t)(( 299*rg + 1000*startg + 114*bg)/1000); > - c = bg + (rg<<16) + 0x010101 * startg; > + c = bg + rg * (1 << 16) + 0x010101 * startg; > for (g = startg; g <= endg; g++) { > s->rgbtoyuv[c] = ((y++) << 16) + (u << 8) + v; > c+= 0x010101; > -- > 2.20.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Sat, Sep 28, 2019 at 03:09:35PM +0200, Paul B Mahol wrote:
> lgtm
will apply
thx
[...]
diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 2c71871d22..87810c88f1 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -395,7 +395,7 @@ static int init(AVFilterContext *ctx) int startg = FFMAX3(-bg, -rg, 0); int endg = FFMIN3(255-bg, 255-rg, 255); uint32_t y = (uint32_t)(( 299*rg + 1000*startg + 114*bg)/1000); - c = bg + (rg<<16) + 0x010101 * startg; + c = bg + rg * (1 << 16) + 0x010101 * startg; for (g = startg; g <= endg; g++) { s->rgbtoyuv[c] = ((y++) << 16) + (u << 8) + v; c+= 0x010101;
Affected every usage of vf_xbr, e.g. the FATE-tests filter-2xbr, filter-3xbr, filter-4xbr. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavfilter/vf_xbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)