[HandBrake] fix audio encoders when linking to FFmpeg 4.4 (rfbz#6006)

commit 563d60f95c4daf534540aa3ce2857ba5a79ab869 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Mon May 31 01:05:43 2021 +0200 fix audio encoders when linking to FFmpeg 4.4 (rfbz#6006) HandBrake.spec | 10 +++++++++- f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) --- diff --git a/HandBrake.spec b/HandBrake.spec index 9554726..3dd5bf3 100644 --- a/HandBrake.spec +++ b/HandBrake.spec @@ -18,7 +18,7 @@ Name: HandBrake Version: 1.3.3 -Release: 11%{!?tag:.%{date}git%{shortcommit0}}%{?dist} +Release: 12%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: An open-source multiplatform video transcoder License: GPLv2+ URL: http://handbrake.fr/ @@ -50,6 +50,8 @@ Patch6: %{name}-no-nasm.patch # rhel gettext is too old to support metainfo # https://github.com/HandBrake/HandBrake/pull/2884 Patch7: %{name}-no-metainfo.patch +# https://github.com/HandBrake/HandBrake/pull/3537 +Patch8: https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d... BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: cmake3 @@ -158,6 +160,9 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0} %if 0%{?rhel} %patch7 -p1 %endif +%if 0%{fedora} > 33 +%patch8 -p1 +%endif mkdir -p download %{?_without_ffmpeg:cp -p %{SOURCE10} download} @@ -259,6 +264,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/HandBrakeCLI %changelog +* Sun May 30 2021 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net&gt; - 1.3.0-12 +- fix audio encoders when linking to FFmpeg 4.4 (rfbz#6006) + * Wed Apr 14 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.3.3-11 - Rebuild for new x265 diff --git a/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch b/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch new file mode 100644 index 0000000..393c89b --- /dev/null +++ b/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch @@ -0,0 +1,25 @@ +From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001 +From: Damiano Galassi <damiog(a)gmail.com&gt; +Date: Sat, 10 Apr 2021 13:18:02 +0200 +Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4. + +--- + libhb/encavcodecaudio.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c +index 52fc4565d8..e6cf424144 100644 +--- a/libhb/encavcodecaudio.c ++++ b/libhb/encavcodecaudio.c +@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list) + + // Prepare input frame + int out_size; +- AVFrame frame = { .nb_samples = pv->samples_per_frame, }; ++ AVFrame frame = { .nb_samples = pv->samples_per_frame, ++ .format = pv->context->sample_fmt, ++ .channels = pv->context->channels ++ }; + + out_size = av_samples_get_buffer_size(NULL, + pv->context->channels,