diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:16:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:16:18 +0100 |
| commit | 28c0678eb764b8d10faf1a988d2f0e2dc79c96a5 (patch) | |
| tree | 5b1c2da26f0d95c5acd7d042dc1cf8666f22e316 /libavcodec/x86/dsputilenc_mmx.c | |
| parent | 4b874fc4fc2739db7a907ce430ac862e625b7387 (diff) | |
| parent | be923ed659016350592acb9b3346f706f8170ac5 (diff) | |
| download | ffmpeg-28c0678eb764b8d10faf1a988d2f0e2dc79c96a5.tar.gz | |
Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'
* commit 'be923ed659016350592acb9b3346f706f8170ac5':
x86: fmtconvert: port to cpuflags
x86: MMX2 ---> MMXEXT in macro names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index f6eadc1f98..c8957af5cb 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -889,7 +889,7 @@ static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *src1, c "pxor " #z ", " #a " \n\t"\ "psubw " #z ", " #a " \n\t" -#define MMABS_MMX2(a,z)\ +#define MMABS_MMXEXT(a, z) \ "pxor " #z ", " #z " \n\t"\ "psubw " #a ", " #z " \n\t"\ "pmaxsw " #z ", " #a " \n\t" @@ -913,7 +913,7 @@ static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *src1, c "paddusw "#t", "#a" \n\t"\ "movd "#a", "#dst" \n\t"\ -#define HSUM_MMX2(a, t, dst)\ +#define HSUM_MMXEXT(a, t, dst) \ "pshufw $0x0E, "#a", "#t" \n\t"\ "paddusw "#t", "#a" \n\t"\ "pshufw $0x01, "#a", "#t" \n\t"\ @@ -975,8 +975,8 @@ DCT_SAD_FUNC(mmx) #undef MMABS #undef HSUM -#define HSUM(a,t,dst) HSUM_MMX2(a,t,dst) -#define MMABS(a,z) MMABS_MMX2(a,z) +#define HSUM(a,t,dst) HSUM_MMXEXT(a,t,dst) +#define MMABS(a,z) MMABS_MMXEXT(a,z) DCT_SAD_FUNC(mmx2) #undef HSUM #undef DCT_SAD |