Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswresample / x86 / swresample_x86.c

diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c
index 71806c12bf9b9d0d91c6d526851333ace794d6a1..74e05e6c06c68b6f647bd23ab63622a7e4cf1a73 100644 (file)
--- a/libswresample/x86/swresample_x86.c
+++ b/libswresample/x86/swresample_x86.c
@@ -146,7 +146,7 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd;
 D(float, sse)
 D(float, avx)
 D(int16, mmx)
-D(int16, sse)
+D(int16, sse2)
 
 
 void swri_rematrix_init_x86(struct SwrContext *s){
@@ -164,9 +164,9 @@ void swri_rematrix_init_x86(struct SwrContext *s){
             s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx;
             s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx;
         }
-        if(mm_flags & AV_CPU_FLAG_SSE) {
-            s->mix_1_1_simd = ff_mix_1_1_a_int16_sse;
-            s->mix_2_1_simd = ff_mix_2_1_a_int16_sse;
+        if(mm_flags & AV_CPU_FLAG_SSE2) {
+            s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2;
+            s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;
         }
         s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t));
         for(i=0; i<nb_out; i++){