diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-05-19 10:02:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-21 03:25:08 +0200 |
| commit | d1a32c3f4912afcf9cf612e746ba104b32f63b28 (patch) | |
| tree | 33bda8f00c02cac1676d9c528562cb99ab4ad914 /libavcodec/x86/hpeldsp_init.c | |
| parent | 19e66c7232d96e4ae8f05b52da2b84dfaa4e4da3 (diff) | |
| download | ffmpeg-d1a32c3f4912afcf9cf612e746ba104b32f63b28.tar.gz | |
x86: kill fpel_mmx.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hpeldsp_init.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index f860533f7e..e9878cf916 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -165,15 +165,17 @@ HPELDSP_AVG_PIXELS16(_mmxext) #define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \ do { \ + if (HAVE_MMX_EXTERNAL) \ c->PFX ## _pixels_tab IDX [0] = PFX ## _pixels ## SIZE ## _ ## CPU; \ + if (HAVE_MMX_INLINE) { \ c->PFX ## _pixels_tab IDX [1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \ c->PFX ## _pixels_tab IDX [2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \ c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \ + } \ } while (0) static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags) { -#if HAVE_MMX_INLINE SET_HPEL_FUNCS(put, [0], 16, mmx); SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx); SET_HPEL_FUNCS(avg, [0], 16, mmx); @@ -181,7 +183,6 @@ static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags) SET_HPEL_FUNCS(put, [1], 8, mmx); SET_HPEL_FUNCS(put_no_rnd, [1], 8, mmx); SET_HPEL_FUNCS(avg, [1], 8, mmx); -#endif /* HAVE_MMX_INLINE */ } static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags) |