Skip to content

V
vlc
Commit 8962e714 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed alignment and potential overread/write in MergeNEON().

parent e7192dbf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/video_filter/deinterlace/merge.c
View file @ 8962e714
...@@ -220,7 +220,7 @@ void MergeNEON (void *restrict out, const void *in1, ...@@ -220,7 +220,7 @@ void MergeNEON (void *restrict out, const void *in1,
uint8_t *outp = out; uint8_t *outp = out;
const uint8_t *in1p = in1; const uint8_t *in1p = in1;
const uint8_t *in2p = in2; const uint8_t *in2p = in2;
size_t mis = ((uintptr_t)outp) & 15; size_t mis = __MIN((16 - ((uintptr_t)outp & 15)) & 15, n);
if (mis) if (mis)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment