PR #22773 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22773
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22773.patch

Forgotten in 2b94f23b06d9bbab4cd5b5fec9f4e53ff365e5ab,
4e51e48ebdd2c2357f5595a3f403427a51b189f8 and
374b3ab03c2a10b7a4f44487195ae47f0a64f0d9.


>From 0a8c11f26d79d895bfdd40df54c20926b9364502 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Fri, 10 Apr 2026 01:28:27 +0200
Subject: [PATCH] swresample/x86/{audio_convert,rematrix}: Remove remnants of
 MMX

Forgotten in 2b94f23b06d9bbab4cd5b5fec9f4e53ff365e5ab,
4e51e48ebdd2c2357f5595a3f403427a51b189f8 and
374b3ab03c2a10b7a4f44487195ae47f0a64f0d9.

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libswresample/x86/audio_convert.asm | 10 ----------
 libswresample/x86/rematrix.asm      | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/libswresample/x86/audio_convert.asm 
b/libswresample/x86/audio_convert.asm
index 40778e0823..f3da5d2047 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
@@ -194,12 +194,7 @@ cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
-%if mmsize == 8
-    emms
     RET
-%else
-    RET
-%endif
 %endmacro
 
 %macro PACK_6CH 8
@@ -284,12 +279,7 @@ pack_6ch_%2_to_%1_u_int %+ SUFFIX:
     add      dstq, mmsize*6
     sub      lend, mmsize/4
     jg .loop
-%if mmsize == 8
-    emms
     RET
-%else
-    RET
-%endif
 %endmacro
 
 %macro UNPACK_6CH 8
diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm
index e2b2a86317..08f0d33be5 100644
--- a/libswresample/x86/rematrix.asm
+++ b/libswresample/x86/rematrix.asm
@@ -148,12 +148,7 @@ mix_1_1_int16_u_int %+ SUFFIX:
     mov%1  [outq + lenq + mmsize], m2
     add        lenq, mmsize*2
         jl .next
-%if mmsize == 8
-    emms
     RET
-%else
-    RET
-%endif
 %endmacro
 
 %macro MIX2_INT16 1
@@ -214,12 +209,7 @@ mix_2_1_int16_u_int %+ SUFFIX:
     mov%1  [outq + lenq + mmsize], m2
     add        lenq, mmsize*2
         jl .next
-%if mmsize == 8
-    emms
     RET
-%else
-    RET
-%endif
 %endmacro
 
 
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to