diff options
Diffstat (limited to 'libswresample/x86/resample_init.c')
| -rw-r--r-- | libswresample/x86/resample_init.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index 9d7d5cf89e..e515762b98 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -50,40 +50,40 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c) switch(c->format){ case AV_SAMPLE_FMT_S16P: if (ARCH_X86_32 && EXTERNAL_MMXEXT(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_int16_mmxext - : ff_resample_common_int16_mmxext; + c->dsp.resample_linear = ff_resample_linear_int16_mmxext; + c->dsp.resample_common = ff_resample_common_int16_mmxext; } if (EXTERNAL_SSE2(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_int16_sse2 - : ff_resample_common_int16_sse2; + c->dsp.resample_linear = ff_resample_linear_int16_sse2; + c->dsp.resample_common = ff_resample_common_int16_sse2; } if (EXTERNAL_XOP(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_int16_xop - : ff_resample_common_int16_xop; + c->dsp.resample_linear = ff_resample_linear_int16_xop; + c->dsp.resample_common = ff_resample_common_int16_xop; } break; case AV_SAMPLE_FMT_FLTP: if (EXTERNAL_SSE(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_float_sse - : ff_resample_common_float_sse; + c->dsp.resample_linear = ff_resample_linear_float_sse; + c->dsp.resample_common = ff_resample_common_float_sse; } if (EXTERNAL_AVX_FAST(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_float_avx - : ff_resample_common_float_avx; + c->dsp.resample_linear = ff_resample_linear_float_avx; + c->dsp.resample_common = ff_resample_common_float_avx; } if (EXTERNAL_FMA3_FAST(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_float_fma3 - : ff_resample_common_float_fma3; + c->dsp.resample_linear = ff_resample_linear_float_fma3; + c->dsp.resample_common = ff_resample_common_float_fma3; } if (EXTERNAL_FMA4(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_float_fma4 - : ff_resample_common_float_fma4; + c->dsp.resample_linear = ff_resample_linear_float_fma4; + c->dsp.resample_common = ff_resample_common_float_fma4; } break; case AV_SAMPLE_FMT_DBLP: if (EXTERNAL_SSE2(mm_flags)) { - c->dsp.resample = c->linear ? ff_resample_linear_double_sse2 - : ff_resample_common_double_sse2; + c->dsp.resample_linear = ff_resample_linear_double_sse2; + c->dsp.resample_common = ff_resample_common_double_sse2; } break; } |