From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Mon, 9 Feb 2015 18:36:00 +0000 (+0100)
Subject: codec: dts: fix custom channel mapping detection/tautology
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7e19ed8b7c7a833b091f9127bac38d7c4a6e958c;p=vlc

codec: dts: fix custom channel mapping detection/tautology
---

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index 09ebc0d757..5d777d4f01 100644
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -548,18 +548,20 @@ static int SyncInfo( const uint8_t *p_buf,
                                 AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
             break;
 
+        case 0xF:
         default:
-            if( i_audio_mode <= 63 )
+            if( (i_audio_mode & 0xFFFF) >= 0x10 )
             {
                 /* User defined */
                 *pi_channels = 0;
                 *pi_channels_conf = 0;
             }
             else return 0;
+
             break;
     }
 
-    if( i_audio_mode & 0x10000 )
+    if( *pi_channels && (i_audio_mode & 0x10000) )
     {
         (*pi_channels)++;
         *pi_channels_conf |= AOUT_CHAN_LFE;