diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 12:03:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 12:09:38 +0400 |
| commit | 446f7c62a2d1358a276212300d09f9af88f9a228 (patch) | |
| tree | dd764077643dfd0d023a94cd82cee99823d97ebb /libavfilter/x86 | |
| parent | fab8a89abeae6bab5d2556d0116ca270ff6da5ed (diff) | |
| parent | 64ed397635ef2666b0ca0c8d8c60a8bc44581d82 (diff) | |
Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
vf_yadif: fix out-of line reads
Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_yadif_init.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index 8d5e76833f..2873744d4b 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -42,12 +42,18 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) #if HAVE_YASM #if ARCH_X86_32 - if (EXTERNAL_MMXEXT(cpu_flags)) + if (EXTERNAL_MMXEXT(cpu_flags)) { yadif->filter_line = ff_yadif_filter_line_mmxext; + yadif->req_align = 8; + } #endif /* ARCH_X86_32 */ - if (EXTERNAL_SSE2(cpu_flags)) + if (EXTERNAL_SSE2(cpu_flags)) { yadif->filter_line = ff_yadif_filter_line_sse2; - if (EXTERNAL_SSSE3(cpu_flags)) + yadif->req_align = 16; + } + if (EXTERNAL_SSSE3(cpu_flags)) { yadif->filter_line = ff_yadif_filter_line_ssse3; + yadif->req_align = 16; + } #endif /* HAVE_YASM */ } |