From 92f8e06ecb431a427ea13d794e5a6bc927a034d2 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 7 May 2013 00:42:22 +0200
Subject: x86: dsputil hpeldsp: Move shared template functions into separate
 object

---
 libavcodec/x86/dsputil_mmx.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'libavcodec/x86/dsputil_mmx.c')

diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 46859a68df..bd1994700d 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -99,21 +99,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 */
 
@@ -877,19 +862,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);
 }
 
 static void gmc_mmx(uint8_t *dst, uint8_t *src,
-- 
cgit v1.2.3