diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-02-19 00:54:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-19 00:54:59 +0000 |
| commit | e10252483e25ab8d5208af56d608c1bd6cd2d06f (patch) | |
| tree | f0e0b05ef998501a46808dbb3475f361bc75a23a /libavcodec | |
| parent | 2213f431c790ae10c8599f21a92ff805fd3e10c9 (diff) | |
| download | ffmpeg-e10252483e25ab8d5208af56d608c1bd6cd2d06f.tar.gz | |
Only enable SSE/3DNOW optimizations when they have been enabled at compilation.
Fixes shared build with SSE/3DNOW disabled but MMX and yasm enabled.
Originally committed as revision 17451 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/fft.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/fft.c b/libavcodec/fft.c index 0760567f72..296f634663 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft.c @@ -89,18 +89,18 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) #if HAVE_MMX && HAVE_YASM has_vectors = mm_support(); - if (has_vectors & FF_MM_SSE) { + if (has_vectors & FF_MM_SSE && HAVE_SSE) { /* SSE for P3/P4/K8 */ s->imdct_calc = ff_imdct_calc_sse; s->imdct_half = ff_imdct_half_sse; s->fft_permute = ff_fft_permute_sse; s->fft_calc = ff_fft_calc_sse; - } else if (has_vectors & FF_MM_3DNOWEXT) { + } else if (has_vectors & FF_MM_3DNOWEXT && HAVE_AMD3DNOWEXT) { /* 3DNowEx for K7 */ s->imdct_calc = ff_imdct_calc_3dn2; s->imdct_half = ff_imdct_half_3dn2; s->fft_calc = ff_fft_calc_3dn2; - } else if (has_vectors & FF_MM_3DNOW) { + } else if (has_vectors & FF_MM_3DNOW && HAVE_AMD3DNOW) { /* 3DNow! for K6-2/3 */ s->imdct_calc = ff_imdct_calc_3dn; s->imdct_half = ff_imdct_half_3dn; |