diff --git a/25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e.patch b/25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e.patch deleted file mode 100644 index e4dffba..0000000 --- a/25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Signed-off-by: James Almer -(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) ---- - libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5ed19..ca7e2dffc1 100644 ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -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; - } - --- -2.25.1 - diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 7217e0d..eb7767d 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -49,9 +49,8 @@ URL: https://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz Source1: %{url}/releases/ffmpeg-%{version}.tar.xz.asc Source2: %{url}/ffmpeg-devel.asc -Patch0: 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e.patch -Patch1: configure-fix-nvenc-detection.patch -Patch2: nvenc-stop-using-deprecated-rc-modes.patch +Patch0: configure-fix-nvenc-detection.patch +Patch1: nvenc-stop-using-deprecated-rc-modes.patch BuildRequires: gcc BuildRequires: alsa-lib-devel