diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:55:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:55:46 +0200 |
| commit | 769efe56b145469cfdf45130bb3fdd2c5eb595d0 (patch) | |
| tree | d769e0c0f0bc5bc2f45d82d745fb8e6bfa243a84 /libavcodec/x86 | |
| parent | 696f5f98e282ad74604ae85661c19ed599c32d81 (diff) | |
| parent | f243bf7aa27fe4d37f7a57ccdabc149a0cc84b95 (diff) | |
| download | ffmpeg-769efe56b145469cfdf45130bb3fdd2c5eb595d0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Remove unused argument from QPEL_OP macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 35d1eb8947..a0c1c3978b 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -475,7 +475,7 @@ static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, ff_put_pixels8_mmxext(block + 8, pixels + 8, line_size, h); } -#define QPEL_OP(OPNAME, ROUNDER, RND, MMX) \ +#define QPEL_OP(OPNAME, RND, MMX) \ static void OPNAME ## qpel8_mc00_ ## MMX (uint8_t *dst, uint8_t *src, \ ptrdiff_t stride) \ { \ @@ -856,9 +856,9 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \ stride, 16); \ } -QPEL_OP(put_, ff_pw_16, _, mmxext) -QPEL_OP(avg_, ff_pw_16, _, mmxext) -QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, mmxext) +QPEL_OP(put_, _, mmxext) +QPEL_OP(avg_, _, mmxext) +QPEL_OP(put_no_rnd_, _no_rnd_, mmxext) #endif /* HAVE_YASM */ |