diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-09 20:01:22 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-21 10:13:05 -0400 |
| commit | 185142a5ea93ef723f70a3ea43797f6c8827eb79 (patch) | |
| tree | 2e19477ae1deb497cb444e6c3683454483063dc5 | |
| parent | 708ab7dd69d5c98221882a8086f68f1bb02a44a3 (diff) | |
| download | ffmpeg-185142a5ea93ef723f70a3ea43797f6c8827eb79.tar.gz | |
fmtconvert: check compile-time x86 instruction set flags
| -rw-r--r-- | libavcodec/x86/fmtconvert_mmx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c index 949dc973f3..6e43280d66 100644 --- a/libavcodec/x86/fmtconvert_mmx.c +++ b/libavcodec/x86/fmtconvert_mmx.c @@ -208,19 +208,19 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) #if HAVE_YASM c->float_interleave = float_interleave_mmx; - if(mm_flags & AV_CPU_FLAG_3DNOW){ + if (HAVE_AMD3DNOW && mm_flags & AV_CPU_FLAG_3DNOW) { if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->float_to_int16 = ff_float_to_int16_3dnow; c->float_to_int16_interleave = float_to_int16_interleave_3dnow; } } - if(mm_flags & AV_CPU_FLAG_3DNOWEXT){ + if (HAVE_AMD3DNOWEXT && mm_flags & AV_CPU_FLAG_3DNOWEXT) { if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->float_to_int16_interleave = float_to_int16_interleave_3dn2; } } #endif - if(mm_flags & AV_CPU_FLAG_SSE){ + if (HAVE_SSE && mm_flags & AV_CPU_FLAG_SSE) { c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse; #if HAVE_YASM c->float_to_int16 = ff_float_to_int16_sse; @@ -228,7 +228,7 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) c->float_interleave = float_interleave_sse; #endif } - if(mm_flags & AV_CPU_FLAG_SSE2){ + if (HAVE_SSE && mm_flags & AV_CPU_FLAG_SSE2) { c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse2; #if HAVE_YASM c->float_to_int16 = ff_float_to_int16_sse2; |