diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-10-09 21:24:20 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 13:36:06 +0200 |
| commit | 20d78a86064a6de5b63e129417b2a38fd333d71f (patch) | |
| tree | af48b1797e3898079a60367e98aa85f5a36c1540 /libavcodec/x86/videodsp_init.c | |
| parent | ef6b85e9b82513df0a38b1065784d20451ecb2a1 (diff) | |
| download | ffmpeg-20d78a86064a6de5b63e129417b2a38fd333d71f.tar.gz | |
libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/videodsp_init.c')
| -rw-r--r-- | libavcodec/x86/videodsp_init.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c index a709d03d26..b5bab7257d 100644 --- a/libavcodec/x86/videodsp_init.c +++ b/libavcodec/x86/videodsp_init.c @@ -219,9 +219,14 @@ static av_noinline void emulated_edge_mc_sse(uint8_t *buf, ptrdiff_t buf_stride, int block_w, int block_h, int src_x, int src_y, int w, int h) { - emulated_edge_mc(buf, buf_stride, src, src_stride, block_w, block_h, - src_x, src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse, - hfixtbl_sse, &ff_emu_edge_hvar_sse); + emulated_edge_mc(buf, buf_stride, src, src_stride, block_w, block_h, src_x, + src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse, hfixtbl_sse, +#if ARCH_X86_64 + &ff_emu_edge_hvar_sse +#else + &ff_emu_edge_hvar_mmx +#endif + ); } #endif /* HAVE_YASM */ |