commit 983b0809b4a0f58c878357d0a0ff0aec8c5077c4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:43:52 2024 +0100
Backport hevecdec fix
backport_hevecdec_fix.patch | 24 ++++++++++++++++++++++++
ffmpeg.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/backport_hevecdec_fix.patch b/backport_hevecdec_fix.patch
new file mode 100644
index 0000000..e931320
--- /dev/null
+++ b/backport_hevecdec_fix.patch
@@ -0,0 +1,24 @@
+From: Anton Khirnov <anton(a)khirnov.net>
+Date: Fri, 23 Feb 2024 08:06:46 +0000 (+0100)
+Subject: lavc/hevcdec: pass an actual codec context to ff_h2645_sei_to_frame()
+X-Git-Tag: n7.0~451
+X-Git-Url:
http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d9f1b321cf58a855...
+
+lavc/hevcdec: pass an actual codec context to ff_h2645_sei_to_frame()
+
+Needed by following commit.
+---
+
+diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
+index b5311ae510..17c6a9212f 100644
+--- a/libavcodec/hevcdec.c
++++ b/libavcodec/hevcdec.c
+@@ -2778,7 +2778,7 @@ static int set_side_data(HEVCContext *s)
+ s->sei.common.content_light.present--;
+ }
+
+- ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL,
++ ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC,
s->avctx,
+ &s->ps.sps->vui.common,
+ s->ps.sps->bit_depth,
s->ps.sps->bit_depth_chroma,
+ s->ref->poc /* no poc_offset in HEVC */);
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 82fc208..989b2ae 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: %{ffmpeg_license}
URL:
https://ffmpeg.org/
%if 0%{?date}
@@ -112,6 +112,7 @@ Source2:
https://ffmpeg.org/ffmpeg-devel.asc
Patch0: ffmpeg-chromium.patch
Patch1:
https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
Patch2:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d46153...
+Patch3:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d9f1b321cf58a85...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -530,6 +531,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Fri Aug 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-2
+- Backport hevecdec fix
+
* Sat Aug 03 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-1
- Update to 6.1.2