aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/x86/swresample_x86.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-12 16:24:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-12 16:35:13 +0200
commit52afa43691116bf35b6398ef3087f3a1508ef9a6 (patch)
tree84701a159dffb1bf9ff49763858fe79eab5151f9 /libswresample/x86/swresample_x86.c
parentbeb0cd6acfe6ad9f32b8fc673507f6189633cc90 (diff)
downloadffmpeg-52afa43691116bf35b6398ef3087f3a1508ef9a6.tar.gz
swr: mix_2_1_float SSE/AVX
Based-on code by Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/swresample_x86.c')
-rw-r--r--libswresample/x86/swresample_x86.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c
index f523dd0ad2..18c601f72e 100644
--- a/libswresample/x86/swresample_x86.c
+++ b/libswresample/x86/swresample_x86.c
@@ -166,9 +166,11 @@ void swri_rematrix_init_x86(struct SwrContext *s){
} else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){
if(mm_flags & AV_CPU_FLAG_SSE) {
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) {
s->mix_1_1_simd = ff_mix_1_1_a_float_avx;
+ s->mix_2_1_simd = ff_mix_2_1_a_float_avx;
}
s->native_simd_matrix = av_mallocz(num * sizeof(float));
memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float));