Accepting request 1124854 from home:iznogood:factory
- Update to version 6.0.1:
* Updates and bugfixes to avcodecs, avformat and avfilters
mainly.
- Drop patch fixed upstream:
* 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
OBS-URL: https://build.opensuse.org/request/show/1124854
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=14
This commit is contained in:
Git OBS Bridge
parent
d99756547d
commit
594a3a843e
@ -1,76 +0,0 @@
|
||||
From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
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 <jamrial@gmail.com>
|
||||
---
|
||||
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.42.0
|
||||
|
||||
3
ffmpeg-6.0.1.tar.xz
Normal file
3
ffmpeg-6.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
|
||||
size 10240172
|
||||
11
ffmpeg-6.0.1.tar.xz.asc
Normal file
11
ffmpeg-6.0.1.tar.xz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmVNe6oYHGZmbXBlZy1k
|
||||
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYNoAH/inH4/UDxn/BhIAdbMUKwYQ3
|
||||
Op1zkvqvZOuVtOdxqYNRViBhH00mgDeTeL6tpWrdwMYHth6Tyb2mVMfrrno3yc3W
|
||||
NB1OwFaq2dLzvdzD/7s3qtx9HG2tyRxXFUp5hkq4RENt4Nlmn++nswfBKcdbzYtp
|
||||
EEy1p+lOqsxSkgzpThLP++UM9awTKOA1Zk8ZAPz7AzipI5OyAV/kbkF5fBkvn32Y
|
||||
hjLXWfwqzMb3GeRHP+3OLnEIxSP7zM/3t6HVXfu4APzEb2UOVUfXVBFzu9Pxfezw
|
||||
7NPBX0iSJ+x+URd74dlcEfTNB0/RB3Yd7LEFtCSlip9ZTtrS9uZHPE6MxmolNME=
|
||||
=KJjo
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082
|
||||
size 10234012
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmP9FsUYHGZmbXBlZy1k
|
||||
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYLVcIAItlwTpkDPwv8WwoQFPeh4J0
|
||||
ydHN31+6A6KqHwCa8CT8sUH3yILXUh5/4zNFgHsXEdOsnGmxoMmE+jLuz68CKDEF
|
||||
esPwamBGcilEK1MNSQcZ1M/7bn2DMJDyC276Q2wxISNocusUe+1+bPoCw7IbXUON
|
||||
qqXTU0Ale4l88WoTgWQiFX01oTlfPTqmDfl0h6uYftpw49fyrkYK0D5dnsslQht4
|
||||
yhvZ0+8KAO+ahR0YnmI4BeCQvJDcD9JD3bePJ3cIoiH9P3xz7GaiIroxpm5lr3z4
|
||||
gdH8xQkBhZkmCQ0HpPg4Zhv42rvE7qDAZkJcr3x2yodrrrEgBzu5gQ9yjESgdFo=
|
||||
=gTpy
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 10:09:46 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 6.0.1:
|
||||
* Updates and bugfixes to avcodecs, avformat and avfilters
|
||||
mainly.
|
||||
- Drop patch fixed upstream:
|
||||
* 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 07:59:01 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
%define _major_expected 7
|
||||
|
||||
Name: ffmpeg-6
|
||||
Version: 6.0
|
||||
Version: 6.0.1
|
||||
Release: 0
|
||||
Summary: Set of libraries for working with various multimedia formats
|
||||
License: GPL-3.0-or-later
|
||||
@ -110,7 +110,6 @@ Patch5: work-around-abi-break.patch
|
||||
Patch6: 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
|
||||
Patch10: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
Patch92: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
|
||||
|
||||
%if %{with amf_sdk}
|
||||
BuildRequires: AMF-devel
|
||||
@ -541,7 +540,6 @@ break compatibility without any notice.
|
||||
%patch5 -p1
|
||||
%patch10 -p1
|
||||
%patch91 -p1
|
||||
%patch92 -p1
|
||||
# Remove when packaging ffmpeg 6.1
|
||||
if pkg-config --atleast-version 6 libplacebo; then
|
||||
%patch6 -p1
|
||||
@ -843,7 +841,7 @@ done
|
||||
%define _name ffmpeg
|
||||
|
||||
Name: ffmpeg-6-mini
|
||||
Version: 6.0
|
||||
Version: 6.0.1
|
||||
Release: 0
|
||||
Summary: Set of libraries for working with various multimedia formats
|
||||
License: GPL-3.0-or-later
|
||||
@ -860,7 +858,6 @@ Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
|
||||
Patch5: work-around-abi-break.patch
|
||||
Patch10: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
Patch92: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
|
||||
BuildRequires: c_compiler
|
||||
Requires: this-is-only-for-build-envs
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user