diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-01 10:59:16 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-01 10:59:16 +0200 |
| commit | a26789cf9f8000a040a4f4481e0f3552cf63dc68 (patch) | |
| tree | ddbaa9b84e427c4538745673c3755b05e3ef6e3d /libswresample | |
| parent | d55252c33156a53dae8e1beba73b163724dec8cf (diff) | |
| download | ffmpeg-a26789cf9f8000a040a4f4481e0f3552cf63dc68.tar.gz | |
Fix compilation with yasm-0.6.2.
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/x86/swresample_x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c index 74e05e6c06..93db7e3796 100644 --- a/libswresample/x86/swresample_x86.c +++ b/libswresample/x86/swresample_x86.c @@ -125,7 +125,7 @@ MULTI_CAPS_FUNC(AV_CPU_FLAG_SSE2, sse2) ac->simd_f = ff_pack_6ch_float_to_int32_a_sse4; } } - if(HAVE_AVX && mm_flags & AV_CPU_FLAG_AVX) { + if(HAVE_AVX_EXTERNAL && mm_flags & AV_CPU_FLAG_AVX) { if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_S32 || out_fmt == AV_SAMPLE_FMT_FLTP && in_fmt == AV_SAMPLE_FMT_S32P) ac->simd_f = ff_int32_to_float_a_avx; if(channels == 6) { @@ -185,7 +185,7 @@ void swri_rematrix_init_x86(struct SwrContext *s){ s->mix_1_1_simd = ff_mix_1_1_a_float_sse; s->mix_2_1_simd = ff_mix_2_1_a_float_sse; } - if(HAVE_AVX && mm_flags & AV_CPU_FLAG_AVX) { + if(HAVE_AVX_EXTERNAL && mm_flags & AV_CPU_FLAG_AVX) { s->mix_1_1_simd = ff_mix_1_1_a_float_avx; s->mix_2_1_simd = ff_mix_2_1_a_float_avx; } |