diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 22:01:47 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 22:01:53 +0200 |
commit | 16b2472d209d5ff714f15efdb761addd81a85028 (patch) | |
tree | 7ad6b8b43c45ae9a714884cb2b680cca0fb7a096 | |
parent | 3ae44df18f5745945119863ef7637b5a89d9e731 (diff) | |
parent | 20784aa6781a2b1b1b6dbbdb29b3ff03cdad0804 (diff) | |
download | ffmpeg-16b2472d209d5ff714f15efdb761addd81a85028.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index e313265f2a..a4e4a480be 100644 --- 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) |