diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:01:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:01:58 +0200 |
| commit | 2f9ef60c97657e5fa47d5f17c5e4714efb672e4e (patch) | |
| tree | 4ea781f1b1ba3f72366a1b3f9d0cb5fbe2963162 /libavcodec/x86/dsputil_mmx.c | |
| parent | bf18810a215c1313ba868c59a0f778aff01616c1 (diff) | |
| parent | 92f8e06ecb431a427ea13d794e5a6bc927a034d2 (diff) | |
| download | ffmpeg-2f9ef60c97657e5fa47d5f17c5e4714efb672e4e.tar.gz | |
Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'
* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
x86: dsputil hpeldsp: Move shared template functions into separate object
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 1288050468..36280dbaee 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -102,21 +102,6 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src, #if HAVE_INLINE_ASM /***********************************/ -/* MMX rounding */ - -#define DEF(x, y) x ## _ ## y ## _mmx -#define SET_RND MOVQ_WTWO -#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX(a, b, c, d, e, f) -#define PAVGB(a, b, c, e) PAVGB_MMX(a, b, c, e) - -#include "rnd_template.c" - -#undef DEF -#undef SET_RND -#undef PAVGBP -#undef PAVGB - -/***********************************/ /* standard MMX */ void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, @@ -898,19 +883,19 @@ QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, mmxext) #if HAVE_INLINE_ASM void ff_put_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - put_pixels8_xy2_mmx(dst, src, stride, 8); + ff_put_pixels8_xy2_mmx(dst, src, stride, 8); } void ff_put_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - put_pixels16_xy2_mmx(dst, src, stride, 16); + ff_put_pixels16_xy2_mmx(dst, src, stride, 16); } void ff_avg_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels8_xy2_mmx(dst, src, stride, 8); + ff_avg_pixels8_xy2_mmx(dst, src, stride, 8); } void ff_avg_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels16_xy2_mmx(dst, src, stride, 16); + ff_avg_pixels16_xy2_mmx(dst, src, stride, 16); } typedef void emulated_edge_mc_func(uint8_t *dst, const uint8_t *src, |