From 03b1993ed4d18087e828533b5ffe3280ed14b911 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 8 Aug 2014 17:20:21 +0200
Subject: [PATCH] dvb_psi: one more fix for estype 0x06

---
 src/input/mpegts/dvb_psi.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 585f2ccb..89ae33e0 100644
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -1374,7 +1374,12 @@ psi_parse_pmt
       hts_stream_type = SCT_MPEG2AUDIO;
       break;
 
-    case 0x06: // 0x06 is Chinese Cable TV AC-3 audio track (see DVB_DESC_REGISTRATION)
+    case 0x06:
+      /* 0x06 is Chinese Cable TV AC-3 audio track */
+      /* but mark it so only when no more descriptors exist */
+      if (dllen > 1)
+        break;
+      /* fall through to SCT_AC3 */
     case 0x81:
       hts_stream_type = SCT_AC3;
       break;
@@ -1414,9 +1419,6 @@ psi_parse_pmt
         break;
 
       case DVB_DESC_REGISTRATION:
-        /* a right format descriptor present? forget the default */
-        if(estype == 0x06)
-          hts_stream_type = SCT_UNKNOWN;
         if(dlen == 4 && 
            ptr[0] == 'A' && ptr[1] == 'C' && ptr[2] == '-' &&  ptr[3] == '3')
           hts_stream_type = SCT_AC3;