summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-27 11:50:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-27 11:50:51 +0100
commitf2bbc2ffc33871bc2901f94dbfaae60497a9f7c5 (patch)
tree63b934e57f33e0dc04257d1b0c021cc390e1e39a /libavcodec
parent5d2f2c76435e134b9c93858f4bac6d0b1d7c26e5 (diff)
parent31a23a0dc663bd42bf593275971b4277a479b73d (diff)
Merge commit '31a23a0dc663bd42bf593275971b4277a479b73d'
* commit '31a23a0dc663bd42bf593275971b4277a479b73d': x86: dsputil_mmx: Remove leftover inline assembly fragments Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/dsputil_mmx.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 2f7f50e3ed..e331858090 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -777,7 +777,7 @@ static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
#if HAVE_YASM
-#define QPEL_OP(OPNAME, ROUNDER, RND, OP, MMX) \
+#define QPEL_OP(OPNAME, ROUNDER, RND, MMX) \
static void OPNAME ## qpel8_mc00_ ## MMX (uint8_t *dst, uint8_t *src, \
int stride) \
{ \
@@ -1158,17 +1158,9 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \
stride, 16); \
}
-#define PUT_OP(a, b, temp, size) \
- "mov"#size" "#a", "#b" \n\t"
-
-#define AVG_MMXEXT_OP(a, b, temp, size) \
- "mov"#size" "#b", "#temp" \n\t" \
- "pavgb "#temp", "#a" \n\t" \
- "mov"#size" "#a", "#b" \n\t"
-
-QPEL_OP(put_, ff_pw_16, _, PUT_OP, mmxext)
-QPEL_OP(avg_, ff_pw_16, _, AVG_MMXEXT_OP, mmxext)
-QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, PUT_OP, mmxext)
+QPEL_OP(put_, ff_pw_16, _, mmxext)
+QPEL_OP(avg_, ff_pw_16, _, mmxext)
+QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, mmxext)
#endif /* HAVE_YASM */