RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-09 11:55:40 +02:00
parent 696f5f98e2 f243bf7aa2
commit 769efe56b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/x86/dsputil_mmx.c
View File

@ -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 */