MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swresample/resample_template: flip order of operations in swri_resample_linear() for 32bit 

Fixes integer overflow

Found-by: BBB
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-29 13:55:29 +02:00
parent 7f5d75f95b
commit c5a405c4f0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libswresample/resample_template.c
View File

@ -62,7 +62,6 @@
# define DELEM int32_t
# define FELEM int32_t
# define FELEM2 int64_t
# define FELEML int64_t
# define FELEM_MAX INT32_MAX
# define FELEM_MIN INT32_MIN
# define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\
@ -174,7 +173,11 @@ int RENAME(swri_resample_linear)(ResampleContext *c,
v2 += src[sample_index + i] * (FELEM2)filter[i + c->filter_alloc];
}
#endif
#ifdef FELEML
val += (v2 - val) * (FELEML) frac / c->src_incr;
#else
val += (v2 - val) / c->src_incr * frac;
#endif
OUT(dst[dst_index], val);
frac += c->dst_incr_mod;