projects
/
platform
/
upstream
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 6.1
[platform/upstream/ffmpeg.git]
/
libavfilter
/
vf_rotate.c
diff --git
a/libavfilter/vf_rotate.c
b/libavfilter/vf_rotate.c
index
4429e3d
..
96c250a
100644
(file)
--- a/
libavfilter/vf_rotate.c
+++ b/
libavfilter/vf_rotate.c
@@
-258,8
+258,8
@@
static uint8_t *interpolate_bilinear16(uint8_t *dst_color,
{
int int_x = av_clip(x>>16, 0, max_x);
int int_y = av_clip(y>>16, 0, max_y);
{
int int_x = av_clip(x>>16, 0, max_x);
int int_y = av_clip(y>>16, 0, max_y);
- int frac_x = x&0xFFFF;
- int frac_y = y&0xFFFF;
+ int
64_t
frac_x = x&0xFFFF;
+ int
64_t
frac_y = y&0xFFFF;
int i;
int int_x1 = FFMIN(int_x+1, max_x);
int int_y1 = FFMIN(int_y+1, max_y);
int i;
int int_x1 = FFMIN(int_x+1, max_x);
int int_y1 = FFMIN(int_y+1, max_y);
@@
-269,10
+269,10
@@
static uint8_t *interpolate_bilinear16(uint8_t *dst_color,
int s01 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * int_y ]);
int s10 = AV_RL16(&src[src_linestep * int_x + i + src_linesize * int_y1]);
int s11 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * int_y1]);
int s01 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * int_y ]);
int s10 = AV_RL16(&src[src_linestep * int_x + i + src_linesize * int_y1]);
int s11 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * int_y1]);
- int s0 = (((1<<16) - frac_x)*s00 + frac_x*s01);
- int s1 = (((1<<16) - frac_x)*s10 + frac_x*s11);
+ int
64_t
s0 = (((1<<16) - frac_x)*s00 + frac_x*s01);
+ int
64_t
s1 = (((1<<16) - frac_x)*s10 + frac_x*s11);
- AV_WL16(&dst_color[i], ((
int64_t)((1<<16) - frac_y)*s0 + (int64_t)
frac_y*s1) >> 32);
+ AV_WL16(&dst_color[i], ((
(1<<16) - frac_y)*s0 +
frac_y*s1) >> 32);
}
return dst_color;
}
return dst_color;