diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-19 23:38:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-21 23:27:35 +0200 |
| commit | 079849f40c52de33941c2776e8c971954b298b48 (patch) | |
| tree | 824efdc7cca143074692ae84b7243af8e4089c29 /libavcodec/x86/pixblockdsp_init.c | |
| parent | 0b37ae2ae475ba9f368f06d3302c5032897978ee (diff) | |
| download | ffmpeg-079849f40c52de33941c2776e8c971954b298b48.tar.gz | |
avcodec/me_cmp: Fix crashes on ARM due to misalignment
Adds a diff_pixels_unaligned()
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872503
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bc488ec28aec4bc91ba47283c49c9f7f25696eaa)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/x86/pixblockdsp_init.c')
| -rw-r--r-- | libavcodec/x86/pixblockdsp_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/pixblockdsp_init.c b/libavcodec/x86/pixblockdsp_init.c index 4d06a44c6d..b9027dee54 100644 --- a/libavcodec/x86/pixblockdsp_init.c +++ b/libavcodec/x86/pixblockdsp_init.c @@ -39,12 +39,14 @@ av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c, if (EXTERNAL_MMX(cpu_flags)) { if (!high_bit_depth) c->get_pixels = ff_get_pixels_mmx; + c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_mmx; } if (EXTERNAL_SSE2(cpu_flags)) { if (!high_bit_depth) c->get_pixels = ff_get_pixels_sse2; + c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_sse2; } } |