This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 909ca1d7ce77f9a188c979902acc223096b5a5ec
Author:     Niklas Haas <[email protected]>
AuthorDate: Wed Jul 8 02:05:46 2026 +0200
Commit:     Niklas Haas <[email protected]>
CommitDate: Tue Jul 14 12:24:01 2026 +0000

    swscale/x86/ops: add missing non-FMA SWS_UOP_LINEAR fallback
    
    Needed for platforms without SSE4.1 support, as well as checkasm.
    
    Signed-off-by: Niklas Haas <[email protected]>
---
 libswscale/x86/ops.c             | 2 ++
 libswscale/x86/ops_float.asm     | 5 +++++
 libswscale/x86/uops_macros.asm.h | 1 +
 3 files changed, 8 insertions(+)

diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c
index 70126d14fc..ce11b46579 100644
--- a/libswscale/x86/ops.c
+++ b/libswscale/x86/ops.c
@@ -328,6 +328,7 @@ SWS_FOR_STRUCT(TYPE, UNPACK,          DECL_ENTRY, EXT, 
NULL, NULL)
 SWS_FOR_STRUCT(TYPE, PACK,            DECL_ENTRY, EXT, NULL, NULL)             
 \
 SWS_FOR_STRUCT(TYPE, LSHIFT,          DECL_ENTRY, EXT, NULL, NULL)             
 \
 SWS_FOR_STRUCT(TYPE, RSHIFT,          DECL_ENTRY, EXT, NULL, NULL)             
 \
+SWS_FOR_STRUCT(TYPE, LINEAR,          DECL_ENTRY, EXT, NULL, setup_linear)     
 \
 SWS_FOR_STRUCT(TYPE, LINEAR_FMA,      DECL_ENTRY, EXT, NULL, setup_linear)     
 \
 SWS_FOR_STRUCT(TYPE, DITHER,          DECL_ENTRY, EXT, NULL, setup_dither)     
 \
 /* end of macro */
@@ -352,6 +353,7 @@ SWS_FOR_STRUCT(TYPE, DITHER,          DECL_ENTRY, EXT, 
NULL, setup_dither)
     SWS_FOR(TYPE, PACK,           REF_ENTRY, EXT)                              
 \
     SWS_FOR(TYPE, LSHIFT,         REF_ENTRY, EXT)                              
 \
     SWS_FOR(TYPE, RSHIFT,         REF_ENTRY, EXT)                              
 \
+    SWS_FOR(TYPE, LINEAR,         REF_ENTRY, EXT)                              
 \
     SWS_FOR(TYPE, LINEAR_FMA,     REF_ENTRY, EXT)                              
 \
     SWS_FOR(TYPE, DITHER,         REF_ENTRY, EXT)                              
 \
     /* end of macro */
diff --git a/libswscale/x86/ops_float.asm b/libswscale/x86/ops_float.asm
index 13f110b20b..3b8055c31a 100644
--- a/libswscale/x86/ops_float.asm
+++ b/libswscale/x86/ops_float.asm
@@ -603,6 +603,10 @@ IF W,   mova mw2, m11
         CONTINUE tmp1q
 %endmacro
 
+%macro LINEAR 2
+        LINEAR_FMA %1, %2, 0
+%endmacro
+
 ;---------------------------------------------------------
 ; Dithering
 
@@ -687,6 +691,7 @@ IF W,   addps mw2, m11
     DECL_%1_ADD             (ADD)
     DECL_%1_MIN             (MIN)
     DECL_%1_MAX             (MAX)
+    DECL_%1_LINEAR          (LINEAR)
     DECL_%1_LINEAR_FMA      (LINEAR_FMA)
     DECL_%1_DITHER          (DITHER)
 %endmacro
diff --git a/libswscale/x86/uops_macros.asm.h b/libswscale/x86/uops_macros.asm.h
index 971f68c880..f855817760 100644
--- a/libswscale/x86/uops_macros.asm.h
+++ b/libswscale/x86/uops_macros.asm.h
@@ -73,6 +73,7 @@
     {DEF_MACRO(TO_U32,              TYPE)}, \
     {DEF_MACRO(TO_F32,              TYPE)}, \
     {DEF_MACRO(SCALE,               TYPE)}, \
+    {DEF_MACRO(LINEAR,              TYPE)}, \
     {DEF_MACRO(LINEAR_FMA,          TYPE)}, \
     {DEF_MACRO(ADD,                 TYPE)}, \
     {DEF_MACRO(MIN,                 TYPE)}, \

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

Reply via email to