From: Tristan Matthews <tmatth@videolan.org>
Date: Thu, 2 Feb 2023 04:39:36 +0000 (-0500)
Subject: opus_header: fix channel mapping family 1 parsing
X-Git-Tag: archive/raspbian/3.0.21-7+rpi1^2~120
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=864961453a702d2a0f71ebe389e44b688d8eafe7;p=vlc.git

opus_header: fix channel mapping family 1 parsing

Fixes #27808

(cherry picked from commit 79fa6af0a98921f9d34933761f4fe20ef6c35309)

Gbp-Pq: Name 0006-opus_header-fix-channel-mapping-family-1-parsing.patch
---

diff --git a/modules/codec/opus_header.c b/modules/codec/opus_header.c
index 4069a5cf..b134b20b 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;