aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-09-28 04:25:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-28 17:24:32 +0200
commit4294dc3589a3ab973b10a85b576ff15e3ffb000d (patch)
treecfdda1b8c020b80a7b7f19691dc482898bc0eaa8 /libavfilter
parentfa211943265ca991548a4cc2f85a6df9cedcd092 (diff)
downloadffmpeg-4294dc3589a3ab973b10a85b576ff15e3ffb000d.tar.gz
avfilter/vf_xbr: Fix left shift of negative number
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> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_xbr.c2
1 files changed, 1 insertions, 1 deletions
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;