diff --git a/extra/ffmpeg/build b/extra/ffmpeg/build index 501cb4e8..9654b910 100755 --- a/extra/ffmpeg/build +++ b/extra/ffmpeg/build @@ -1,7 +1,6 @@ #!/bin/sh -e patch -p1 < add-av_stream_get_first_dts-for-chromium.patch -patch -p1 < binutils-2.41.patch ./configure \ --cc="$CC" \ diff --git a/extra/ffmpeg/checksums b/extra/ffmpeg/checksums index 005106c7..78779e5a 100644 --- a/extra/ffmpeg/checksums +++ b/extra/ffmpeg/checksums @@ -1,3 +1,2 @@ -4879074c357102f85932673044c57c144b0c188ae58edec2a115965536ee340f5e +622b3ac14ee6259edfc93ddd911672aedd654fe78518848051eb8dfe907c739c62 4f16712641b400498753572c0f2d1e30f28fa0df0ea8d0bd2da9d2d74f6613b3ee -4ce8f7ccc5b582575bcf16c399a3cccbd53c8347ae836951ea50c5045f1b8f3232 diff --git a/extra/ffmpeg/patches/binutils-2.41.patch b/extra/ffmpeg/patches/binutils-2.41.patch deleted file mode 100644 index 395b4db0..00000000 --- a/extra/ffmpeg/patches/binutils-2.41.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5e..ca7e2df 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; - } - diff --git a/extra/ffmpeg/sources b/extra/ffmpeg/sources index 56faaf7e..a386408a 100644 --- a/extra/ffmpeg/sources +++ b/extra/ffmpeg/sources @@ -1,3 +1,2 @@ -https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz +https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.xz patches/add-av_stream_get_first_dts-for-chromium.patch -patches/binutils-2.41.patch diff --git a/extra/ffmpeg/version b/extra/ffmpeg/version index 384681ba..88405e37 100644 --- a/extra/ffmpeg/version +++ b/extra/ffmpeg/version @@ -1 +1 @@ -6.0 1 +6.0.1 1