diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-05-06 00:58:07 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-05-06 11:02:07 +0200 |
| commit | 9e5e76ef9ea803432ef2782a3f528c3f5bab621e (patch) | |
| tree | 7cfe225fc72799b2456496ae55efd5ac2fd0f852 /libavcodec/x86/hpeldsp_init.c | |
| parent | ac87eaf856e0fb51917266b899bb15d19b907baf (diff) | |
| download | ffmpeg-9e5e76ef9ea803432ef2782a3f528c3f5bab621e.tar.gz | |
x86: More specific ifdefs for dsputil/hpeldsp init functions
Diffstat (limited to 'libavcodec/x86/hpeldsp_init.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index d573d05c76..e79f34396d 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -150,7 +150,7 @@ void ff_avg_pixels8_xy2_3dnow(uint8_t *block, const uint8_t *pixels, static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int mm_flags) { -#if HAVE_INLINE_ASM +#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); @@ -158,12 +158,12 @@ static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int mm_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_INLINE_ASM */ +#endif /* HAVE_MMX_INLINE */ } static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int mm_flags) { -#if HAVE_YASM +#if HAVE_MMXEXT_EXTERNAL c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext; c->put_pixels_tab[0][2] = put_pixels16_y2_mmxext; @@ -192,12 +192,12 @@ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int mm_flags) c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext; c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext; } -#endif /* HAVE_YASM */ +#endif /* HAVE_MMXEXT_EXTERNAL */ } static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int mm_flags) { -#if HAVE_YASM +#if HAVE_AMD3DNOW_EXTERNAL c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow; c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow; @@ -226,19 +226,19 @@ static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int mm_flags) c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow; c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow; } -#endif /* HAVE_YASM */ +#endif /* HAVE_AMD3DNOW_EXTERNAL */ } static void hpeldsp_init_sse2(HpelDSPContext *c, int flags, int mm_flags) { -#if HAVE_YASM +#if HAVE_SSE2_EXTERNAL if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) { // these functions are slower than mmx on AMD, but faster on Intel c->put_pixels_tab[0][0] = ff_put_pixels16_sse2; c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_sse2; c->avg_pixels_tab[0][0] = ff_avg_pixels16_sse2; } -#endif /* HAVE_YASM */ +#endif /* HAVE_SSE2_EXTERNAL */ } void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags) |