@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Sun Oct  1 15:31:56 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>

+

+- Add ffmpeg-x86-mathops.patch

+

+-------------------------------------------------------------------

 Fri Mar  3 03:03:03 UTC 2023 - olaf@aepfle.de

 - Version update to 3.4.12

​

@@ -72,6 +72,7 @@

 Patch4:         ffmpeg-codec-choice.diff

 Patch6:         0001-opusenc-psy-disable-stereo-searches.patch

 Patch7:         ffmpeg-fix-build-fdk-aac2.patch

+Patch8:         ffmpeg-x86-mathops.patch

 BuildRequires:  ladspa-devel

 BuildRequires:  libgsm-devel

 BuildRequires:  libmp3lame-devel

​

@@ -0,0 +1,59 @@

+diff -rup a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h

+--- a/libavcodec/x86/mathops.h 2023-10-01 13:02:26.829463017 +0200

++++ b/libavcodec/x86/mathops.h 2023-10-01 13:05:19.219502582 +0200

+@@ -35,12 +35,20 @@

+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)

+ {

+     int rt, dummy;

++    if (__builtin_constant_p(shift))

+     __asm__ (

+         "imull %3               \n\t"

+         "shrdl %4, %%edx, %%eax \n\t"

+         :"=a"(rt), "=d"(dummy)

+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)

++        :"a"(a), "rm"(b), "i"(shift & 0x1F)

+     );

++    else

++        __asm__ (

++            "imull %3               \n\t"

++            "shrdl %4, %%edx, %%eax \n\t"

++            :"=a"(rt), "=d"(dummy)

++            :"a"(a), "rm"(b), "c"((uint8_t)shift)

++        );

+     return rt;

+ }

+ 

+@@ -113,19 +121,31 @@ __asm__ volatile(\

+ // avoid +32 for shift optimization (gcc should do that ...)

+ #define NEG_SSR32 NEG_SSR32

+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){

++    if (__builtin_constant_p(s))

+     __asm__ ("sarl %1, %0\n\t"

+          : "+r" (a)

+-         : "ic" ((uint8_t)(-s))

++         : "i" (-s & 0x1F)

+     );

++    else

++        __asm__ ("sarl %1, %0\n\t"

++               : "+r" (a)

++               : "c" ((uint8_t)(-s))

++        );

+     return a;

+ }

+ 

+ #define NEG_USR32 NEG_USR32

+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){

++    if (__builtin_constant_p(s))

+     __asm__ ("shrl %1, %0\n\t"

+          : "+r" (a)

+-         : "ic" ((uint8_t)(-s))

++         : "i" (-s & 0x1F)

+     );

++    else

++        __asm__ ("shrl %1, %0\n\t"

++               : "+r" (a)

++               : "c" ((uint8_t)(-s))

++        );

+     return a;

+ }

+ 

​