[ffmpeg/f39: 18/18] Merge branch 'f40' into f39
commit 0aa238257bf10d19eb4fce2e90255c1d22c91e50
Merge: f400d60 e87ef40
Author: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Thu Feb 29 14:44:55 2024 +0100
Merge branch 'f40' into f39
...ter-vf_libplacebo-remove-deprecated-field.patch | 73 ------------
..._libplacebo-wrap-deprecated-opts-in-FF_AP.patch | 76 ------------
...peg_filter-initialize-the-o-to-silence-th.patch | 30 -----
ffmpeg-gcc14.patch | 131 +++++++++++++++++++++
ffmpeg.spec | 46 +++++---
rf-gcc14.patch | 60 ++++++++++
sources | 4 +-
7 files changed, 220 insertions(+), 200 deletions(-)
---
diff --cc ffmpeg.spec
index ca61231,f50edb8..f4639ff
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@@ -551,12 -544,30 +544,27 @@@ strip %{buildroot}%{_libdir}/%{name}/li
%changelog
+ * Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-5
+ - rebuilt
+
+ * Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-4
+ - Switch to noopenh264-devel for f39+
+
+ * Tue Jan 16 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 6.1.1-3
+ - Rebuilt for libavcodec-freeworld
+
+ * Sun Jan 14 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-2
+ - rebuilt
+
+ * Mon Jan 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-1
+ - Update to 6.1.1 release
+
-* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 6.1-3
-- Bump
+* Tue Nov 21 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 6.0.1-3
+- Backport AV1 VA-API encode support - Thomas Crider
-* Wed Nov 15 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.1-2
+* Wed Nov 15 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0.1-2
- Add patch to fix fedora ffmpeg brokenABI change
-* Sat Nov 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.1-1
-- Update to 6.1 release
-
* Fri Nov 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0.1-1
- Update to 6.0.1 release