[vlc-commits] codec: opus: don't support more than 8 channels

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Mar 12 17:50:31 2014 +0100| [e49759a3ed6261661f5a75d919a8b3b9a952b97a] | committer: Francois Cartegnie

codec: opus: don't support more than 8 channels

We have no mapping for > 8 channels.
cid #1062574

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e49759a3ed6261661f5a75d919a8b3b9a952b97a
---

 modules/codec/opus.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/opus.c b/modules/codec/opus.c
index 0df17c7..9f9858a 100644
--- a/modules/codec/opus.c
+++ b/modules/codec/opus.c
@@ -283,7 +283,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
     msg_Dbg( p_dec, "Opus audio with %d channels", p_header->channels);
 
     if((p_header->channels>2 && p_header->channel_mapping==0) ||
-       (p_header->channels>8 && p_header->channel_mapping==1) ||
+        p_header->channels>8 ||
         p_header->channel_mapping>1)
     {
         msg_Err( p_dec, "Unsupported channel mapping" );
@@ -297,7 +297,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
     p_dec->fmt_out.audio.i_channels = p_header->channels;
     p_dec->fmt_out.audio.i_rate = 48000;
 
-    if( p_header->channels>2 && p_header->channels<9 )
+    if( p_header->channels>2 )
     {
         static const uint32_t *pi_ch[6] = { pi_3channels_in, pi_4channels_in,
                                             pi_5channels_in, pi_6channels_in,