Merge remote-tracking branch 'qatar/master'

* qatar/master: x86: hpeldsp: Remove unused macro definitions Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 16b2472d20
parent 3ae44df18f 20784aa678
commit 16b2472d20
1 changed files with 0 additions and 7 deletions
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@ -113,8 +113,6 @@ void ff_avg_pixels8_xy2_3dnow(uint8_t *block, const uint8_t *pixels,


 #if HAVE_YASM
-#define ff_put_pixels8_mmx ff_put_pixels8_mmxext
-
 /***********************************/
 /* 3Dnow specific */

@ -139,11 +137,6 @@ void ff_avg_pixels8_xy2_3dnow(uint8_t *block, const uint8_t *pixels,
 #if HAVE_INLINE_ASM
 #define put_no_rnd_pixels16_mmx put_pixels16_mmx
 #define put_no_rnd_pixels8_mmx put_pixels8_mmx
-#define put_pixels16_mmxext put_pixels16_mmx
-#define put_pixels8_mmxext put_pixels8_mmx
-#define put_pixels4_mmxext put_pixels4_mmx
-#define put_no_rnd_pixels16_mmxext put_no_rnd_pixels16_mmx
-#define put_no_rnd_pixels8_mmxext put_no_rnd_pixels8_mmx

 static void put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
                            ptrdiff_t line_size, int h)