| Message ID | 20201028224240.10475-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Commit | 993429cfb4a1a8d491d124be228cb7d620a57ba9 |
| Headers | show |
| Series | [FFmpeg-devel] swscale/x86/yuv2rgb: fix crashes when loading alpha from unaligned buffers | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Wed, 28 Oct 2020, Marton Balint wrote: > Regression since fc6a5883d6af8cae0e96af84dda0ad74b360a084 on SSSE3 enabled > CPUs. > > Fixes ticket #8955. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libswscale/x86/yuv_2_rgb.asm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm > index 003dff1f25..2f0b4130df 100644 > --- a/libswscale/x86/yuv_2_rgb.asm > +++ b/libswscale/x86/yuv_2_rgb.asm > @@ -286,7 +286,7 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters > %ifidn %1, yuv > pcmpeqd m3, m3 ; Set alpha empty > %else > - mova m3, [pa_2indexq + 2 * indexq] ; Load alpha > + movu m3, [pa_2indexq + 2 * indexq] ; Load alpha > %endif > mova m5, m_blue > mova m6, m_red Will apply... Regards, Marton
diff --git a/libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm index 003dff1f25..2f0b4130df 100644 --- a/libswscale/x86/yuv_2_rgb.asm +++ b/libswscale/x86/yuv_2_rgb.asm @@ -286,7 +286,7 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters %ifidn %1, yuv pcmpeqd m3, m3 ; Set alpha empty %else - mova m3, [pa_2indexq + 2 * indexq] ; Load alpha + movu m3, [pa_2indexq + 2 * indexq] ; Load alpha %endif mova m5, m_blue mova m6, m_red
Regression since fc6a5883d6af8cae0e96af84dda0ad74b360a084 on SSSE3 enabled CPUs. Fixes ticket #8955. Signed-off-by: Marton Balint <cus@passwd.hu> --- libswscale/x86/yuv_2_rgb.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)