diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:55:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:55:31 +0200 |
| commit | bf18810a215c1313ba868c59a0f778aff01616c1 (patch) | |
| tree | ba58b0123e59c875e8603d20646de0b2d37b3c1f /libavcodec/x86/rnd_template.c | |
| parent | f302ba4ddab75d217e1ed63d15a56ef4e6e799b3 (diff) | |
| parent | 7edaf4edb5c3c04f34ad1242680cbc32d11f4087 (diff) | |
| download | ffmpeg-bf18810a215c1313ba868c59a0f778aff01616c1.tar.gz | |
Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'
* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/rnd_template.c')
| -rw-r--r-- | libavcodec/x86/rnd_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/rnd_template.c b/libavcodec/x86/rnd_template.c index 35d80edfb6..09f67b17f8 100644 --- a/libavcodec/x86/rnd_template.c +++ b/libavcodec/x86/rnd_template.c @@ -132,7 +132,7 @@ static void DEF(avg, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff "packuswb %%mm5, %%mm4 \n\t" "pcmpeqd %%mm2, %%mm2 \n\t" "paddb %%mm2, %%mm2 \n\t" - OP_AVG(%%mm3, %%mm4, %%mm5, %%mm2) + PAVGB_MMX(%%mm3, %%mm4, %%mm5, %%mm2) "movq %%mm5, (%2, %%"REG_a") \n\t" "add %3, %%"REG_a" \n\t" @@ -156,7 +156,7 @@ static void DEF(avg, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff "packuswb %%mm1, %%mm0 \n\t" "pcmpeqd %%mm2, %%mm2 \n\t" "paddb %%mm2, %%mm2 \n\t" - OP_AVG(%%mm3, %%mm0, %%mm1, %%mm2) + PAVGB_MMX(%%mm3, %%mm0, %%mm1, %%mm2) "movq %%mm1, (%2, %%"REG_a") \n\t" "add %3, %%"REG_a" \n\t" |