SHA256
1
0
forked from pool/ffmpeg-7

Compare commits

..

17 Commits

Author SHA256 Message Date
Ana Guerrero
44e58ba163 Accepting request 1195053 from multimedia:libs
- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
  to resolve build failure on armv7 [boo#1229338]

OBS-URL: https://build.opensuse.org/request/show/1195053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=7
2024-08-22 16:10:27 +00:00
OBS User unknown
ff2a908032 [info=f803df26e37180e4cb16e1e5c0a357b23d53b87108ed61cd85ebf6b6e6fb130d]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=16
2024-08-21 10:08:05 +00:00
Dominique Leuenberger
6cdd476369 Accepting request 1193125 from multimedia:libs
- Update to version 7.0.2:

OBS-URL: https://build.opensuse.org/request/show/1193125
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=6
2024-08-12 10:31:00 +00:00
Dominique Leuenberger
8cbc397a59 Accepting request 1191766 from multimedia:libs
- Add ffmpeg-7-fix-crashes.patch:
  Backporting 5b87869c from upstream, fix track handling when mixing
  IAMF and video tracks, Fixes crashes when muxing the two together.

OBS-URL: https://build.opensuse.org/request/show/1191766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=5
2024-08-06 07:08:13 +00:00
OBS User unknown
f123e2a485 [info=8c17f41823d4600460b89dd35ff0365d154e30b5ae64f6d51ca6e5862223987c]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=11
2024-08-05 10:26:50 +00:00
Dominique Leuenberger
ff88b22e6b Accepting request 1190843 from multimedia:libs
forwarded submit from qzhao; fix spellos in bug numbers

OBS-URL: https://build.opensuse.org/request/show/1190843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=4
2024-08-01 20:05:08 +00:00
OBS User unknown
fac57fe4a0 [info=c11c165366f5efd4f76b39c067ee40963b935711f86e1d14fd08ef565763b0fc]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=10
2024-08-01 03:21:30 +00:00
Dominique Leuenberger
f66ec2e89b Accepting request 1189880 from multimedia:libs
ffmpeg CVE patches

OBS-URL: https://build.opensuse.org/request/show/1189880
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=3
2024-07-28 15:19:40 +00:00
OBS User unknown
14763875da [info=99ea9689b9928285bdc91473b710e322c6674d77460c31063bc7209002dfa7e3]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=9
2024-07-27 06:41:26 +00:00
OBS User unknown
e437d3969c [info=fbe5e55a657c3ed2f9397d73c6a2952eabab5b3d5085e526c709a573f6ec97b9]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=8
2024-07-27 06:40:25 +00:00
OBS User unknown
e0891e621b [info=cfe0711badaae4cfbccf67b46e8058d05336b845a8a44479fa7ac89ed55deea3]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=7
2024-07-27 06:38:38 +00:00
b9d6f48455 [info=5866842008640d8587d2a2505eedfe03f21398112f825fb2986c6286a098bf00]
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=6
2024-07-09 14:03:20 +00:00
Ana Guerrero
64b2585ab8 Accepting request 1185067 from multimedia:libs
- Add ffmpeg-7-CVE-2024-32230.patch:
  Backporting 96449cfe from upstream, Fix 1 line and one column images.
  (CVE-2024-32230 bsc#1227296)

- Add ffmpeg-7-CVE-2024-32228.patch:
  Backporting 45964876 from upstream, Fix segfault on invalid film
  grain metadata.
  (CVE-2024-32228, bsc#1227277)

OBS-URL: https://build.opensuse.org/request/show/1185067
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=2
2024-07-04 14:24:10 +00:00
8ec2a2c630 Replace duplicate metadata; use form from git-format-patch
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=4
2024-07-03 07:45:28 +00:00
1a19def9cd Add ffmpeg-7-CVE-2024-32228.patch ffmpeg-7-CVE-2024-32230.patch to fix CVE bugs. (CVE-2024-32228, bsc#1227277, CVE-2024-32230, bsc#1227296)
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=3
2024-07-03 07:39:13 +00:00
Ana Guerrero
864d1ce0ff Accepting request 1169659 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/1169659
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=1
2024-04-23 16:56:09 +00:00
c3ec4f21e1 Accepting request 1166681 from home:jengelh:ff7
OBS-URL: https://build.opensuse.org/request/show/1166681
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=1
2024-04-19 10:41:46 +00:00
7 changed files with 69 additions and 17 deletions

View File

@ -0,0 +1,58 @@
From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 9 Aug 2024 11:32:00 +0100
Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
binutils 2.43
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
binutils 2.43 has stricter validation for labels[1] and results in errors
when building ffmpeg for armv5:
src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
Remove the leading zero in the "01" label to resolve this error.
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
index 4f9aa485fd..d31568611c 100644
--- a/libavcodec/arm/mlpdsp_armv5te.S
+++ b/libavcodec/arm/mlpdsp_armv5te.S
@@ -229,7 +229,7 @@ A .endif
.endif
// Begin loop
-01:
+1:
.if TOTAL_TAPS == 0
// Things simplify a lot in this case
// In fact this could be pipelined further if it's worth it...
@@ -241,7 +241,7 @@ A .endif
str ST0, [PST, #-4]!
str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
str ST0, [PSAMP], #4 * MAX_CHANNELS
- bne 01b
+ bne 1b
.else
.if \fir_taps & 1
.set LOAD_REG, 1
@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
str ST3, [PST, #-4]!
str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
str ST3, [PSAMP], #4 * MAX_CHANNELS
- bne 01b
+ bne 1b
.endif
b 99f
--
2.46.0

View File

@ -1,4 +1,4 @@
mtime: 1723277105
commit: 62e69514f7630d78d61eaba08f38722630b84b1cd4a21f572e09cb0b26d8249d
mtime: 1724235149
commit: f803df26e37180e4cb16e1e5c0a357b23d53b87108ed61cd85ebf6b6e6fb130d
url: https://src.opensuse.org/jengelh/ffmpeg-7
revision: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbbe70dceb56f3b2613ab3df8bd9310c0e9282365a8a27434d16bce808cc1663
oid sha256:4bf92aeac4ca09ce9391f9f98bcb8c54a71230abd8e423126cf4496c89543fbd
size 256

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b
size 10791240

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmYPNtMYHGZmbXBlZy1k
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYFdUIAIOFgLplbe7CHY0G3bQuCK8N
Q+js2eLPxKNbeBhshcHDyNResAT+uHE7fQYRFUcETf5qqoPHyDptbG/o+onlGW8M
vNwu6wTC3XiFjKjJKBRwyXYS31J+R/re2w+LiEI+OnekRhaQ/vbj1bbjREEQLtOv
7086Oc6ZzMAsxjc6wGde4eJkhTQT8HYF6lU0Bsm4yeqCAcppfGv6OwZn8fyQ/L9i
PaqFJFzs4C8PdRRdSQ7VifAcAAmyHNoRY611ZCbnJvoc7oEU44SVIKsryqRBunoX
aAZ1eNwoI/Oz/uC/yK+S3oaAauZuUZFxgc0hqCxYLZF5TeRvF4Y8cPTTymTuVDM=
=Hz9R
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 21 09:58:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
to resolve build failure on armv7 [boo#1229338]
-------------------------------------------------------------------
Wed Aug 7 07:37:24 UTC 2024 - Cliff Zhao <qzhao@suse.com>

View File

@ -110,6 +110,7 @@ Patch5: work-around-abi-break.patch
Patch10: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch95: ffmpeg-7-fix-crashes.patch
Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel >= 3.98.3
@ -823,6 +824,7 @@ Patch5: work-around-abi-break.patch
Patch10: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch95: ffmpeg-7-fix-crashes.patch
Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
BuildRequires: c_compiler
Requires: this-is-only-for-build-envs