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/cavsdsp.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/cavsdsp.c')
| -rw-r--r-- | libavcodec/x86/cavsdsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 9643b81af3..7e1ae04cbf 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -430,7 +430,7 @@ static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, ui "mov" #size " " #b ", " #temp " \n\t"\ "pavgusb " #temp ", " #a " \n\t"\ "mov" #size " " #a ", " #b " \n\t" -#define AVG_MMX2_OP(a,b,temp, size) \ +#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" @@ -439,7 +439,7 @@ static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, ui #if HAVE_MMXEXT_INLINE QPEL_CAVS(put_, PUT_OP, mmx2) -QPEL_CAVS(avg_, AVG_MMX2_OP, mmx2) +QPEL_CAVS(avg_,AVG_MMXEXT_OP, mmx2) CAVS_MC(put_, 8, mmx2) CAVS_MC(put_, 16,mmx2) |