diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:59:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:00:40 +0200 |
| commit | 108e2ae8299a221e78c549a69c09a5eb1cebbd6c (patch) | |
| tree | 49d7c9772d07f0161735a88310c68145ea90262c /libavcodec/x86/hpeldsp_rnd_template.c | |
| parent | a6e782434a218a51b243c00c2b844b7abb4d4509 (diff) | |
| parent | 110796739ab32854dc0b6b0a1c95e6ae98889062 (diff) | |
| download | ffmpeg-108e2ae8299a221e78c549a69c09a5eb1cebbd6c.tar.gz | |
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hpeldsp_rnd_template.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_rnd_template.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/x86/hpeldsp_rnd_template.c b/libavcodec/x86/hpeldsp_rnd_template.c index 0f93614708..b88d8efb07 100644 --- a/libavcodec/x86/hpeldsp_rnd_template.c +++ b/libavcodec/x86/hpeldsp_rnd_template.c @@ -134,28 +134,6 @@ static void DEF(put, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_ :REG_a, "memory"); } -#ifndef NO_RND -static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) -{ - MOVQ_BFE(mm6); - JUMPALIGN(); - do { - __asm__ volatile( - "movq %1, %%mm0 \n\t" - "movq 1%1, %%mm1 \n\t" - "movq %0, %%mm3 \n\t" - PAVGB(%%mm0, %%mm1, %%mm2, %%mm6) - OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6) - "movq %%mm0, %0 \n\t" - :"+m"(*block) - :"m"(*pixels) - :"memory"); - pixels += line_size; - block += line_size; - } while (--h); -} -#endif // NO_RND - static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { MOVQ_BFE(mm6); |