diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-09-11 15:54:10 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 22:59:43 +0200 |
| commit | 578bbf8149fcb0ae98055e67e6ab92f23384e6fe (patch) | |
| tree | b70844a04dbdd282436879c02e9c03d9ee05ecee | |
| parent | 23a5a24c0fe5441c4f9af2b012bcbf2f42791809 (diff) | |
| download | ffmpeg-578bbf8149fcb0ae98055e67e6ab92f23384e6fe.tar.gz | |
diracdsp: Fix unprotected inline asm
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/diracdsp_mmx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_mmx.c index 693a9af4f8..2a040da30e 100644 --- a/libavcodec/x86/diracdsp_mmx.c +++ b/libavcodec/x86/diracdsp_mmx.c @@ -71,12 +71,16 @@ void ff_diracdsp_init_mmx(DiracDSPContext* c) #endif #endif +#if HAVE_MMX_INLINE PIXFUNC(put, 0, mmx); PIXFUNC(avg, 0, mmx); +#endif +#if HAVE_MMXEXT_INLINE if (mm_flags & AV_CPU_FLAG_MMX2) { PIXFUNC(avg, 0, mmx2); } +#endif if (mm_flags & AV_CPU_FLAG_SSE2) { #if HAVE_YASM @@ -87,9 +91,11 @@ void ff_diracdsp_init_mmx(DiracDSPContext* c) c->add_dirac_obmc[1] = ff_add_dirac_obmc16_sse2; c->add_dirac_obmc[2] = ff_add_dirac_obmc32_sse2; #endif +#if HAVE_SSE2_INLINE c->put_dirac_pixels_tab[1][0] = ff_put_dirac_pixels16_sse2; c->avg_dirac_pixels_tab[1][0] = ff_avg_dirac_pixels16_sse2; c->put_dirac_pixels_tab[2][0] = ff_put_dirac_pixels32_sse2; c->avg_dirac_pixels_tab[2][0] = ff_avg_dirac_pixels32_sse2; +#endif } } |