diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 16:01:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 16:02:09 +0200 |
| commit | 0083c16605aa5997534e87e68f97ef85a8c3b7b8 (patch) | |
| tree | cdf80ddc1cc2e857b95b952fb3e7789dca0e388f /libavfilter/vf_transpose.c | |
| parent | 9295ee137ac91a9370435e5673820d8aa9d62cca (diff) | |
| download | ffmpeg-0083c16605aa5997534e87e68f97ef85a8c3b7b8.tar.gz | |
avfilter/vf_transpose: Fix rounding error
Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_transpose.c')
| -rw-r--r-- | libavfilter/vf_transpose.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 911329caac..e4de31b042 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -151,7 +151,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int hsub = plane == 1 || plane == 2 ? trans->hsub : 0; int vsub = plane == 1 || plane == 2 ? trans->vsub : 0; int pixstep = trans->pixsteps[plane]; - int inh = in->height >> vsub; + int inh = FF_CEIL_RSHIFT(in->height, vsub); int outw = FF_CEIL_RSHIFT(out->width, hsub); int outh = FF_CEIL_RSHIFT(out->height, vsub); int start = (outh * jobnr ) / nb_jobs; |