From 08adee3a8b972814605c05bcb8378dac7379fb16 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 6 Sep 2024 16:11:46 -0400 Subject: [PATCH] Fix opus channel mapping family one parsing https://code.videolan.org/videolan/vlc/-/merge_requests/5590 Fixes: rhbz#2307919 --- 5590.patch | 28 ++++++++++++++++++++++++++++ vlc.spec | 8 ++++++++ 2 files changed, 36 insertions(+) create mode 100644 5590.patch diff --git a/5590.patch b/5590.patch new file mode 100644 index 0000000..38ec3cc --- /dev/null +++ b/5590.patch @@ -0,0 +1,28 @@ +From a761e1c202b632e7865d18fcf11a2b9e285ea9ae Mon Sep 17 00:00:00 2001 +From: Tristan Matthews +Date: Wed, 1 Feb 2023 23:39:36 -0500 +Subject: [PATCH] opus_header: fix channel mapping family 1 parsing + +Fixes #27808 + +(cherry picked from commit 79fa6af0a98921f9d34933761f4fe20ef6c35309) +--- + modules/codec/opus_header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/codec/opus_header.c b/modules/codec/opus_header.c +index 4069a5cf4613..b134b20b625b 100644 +--- a/modules/codec/opus_header.c ++++ b/modules/codec/opus_header.c +@@ -205,7 +205,7 @@ int opus_header_parse(const unsigned char *packet, int len, OpusHeader *h) + h->nb_coupled = ch; + + /* Multi-stream support */ +- if(h->channel_mapping == 2) ++ if(h->channel_mapping <= 2) + { + if (h->nb_coupled + h->nb_streams > 255) + return 0; +-- +GitLab + diff --git a/vlc.spec b/vlc.spec index c01d260..e70c68c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,6 +33,14 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Claus URL: https://www.videolan.org Source: https://get.videolan.org/vlc/%{version}/vlc-%{version}.tar.xz Source: macros.vlc + +## upstream patches +# opus_header: fix channel mapping family 1 parsing (rhbz#2307919) +Patch: https://code.videolan.org/videolan/vlc/-/merge_requests/5590.patch + +## upstreamable patches + +## downstream patches # https://fedoraproject.org/wiki/Changes/CryptoPolicy Patch: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch # Fix building with fdk-aac-2.0; backport for 3.0 from flathub