# HG changeset patch
# User cehoyos
# Date 1305236244 0
# Node ID 20285793cdef96c9b7774d446f5da784152a65f4
# Parent  398435ba0e6618761b0da3ac443bcac4af099552
Support S302M in the native ts demuxer.

diff -r 398435ba0e66 -r 20285793cdef libmpdemux/demux_ts.c
--- a/libmpdemux/demux_ts.c	Thu May 12 18:20:38 2011 +0000
+++ b/libmpdemux/demux_ts.c	Thu May 12 21:37:24 2011 +0000
@@ -81,6 +81,7 @@
 	AUDIO_AAC	= mmioFOURCC('M', 'P', '4', 'A'),
 	AUDIO_AAC_LATM	= mmioFOURCC('M', 'P', '4', 'L'),
 	AUDIO_TRUEHD	= mmioFOURCC('T', 'R', 'H', 'D'),
+	AUDIO_S302M     = mmioFOURCC('B', 'S', 'S', 'D'),
 	SPU_DVD		= 0x3000000,
 	SPU_DVB		= 0x3000001,
 	SPU_TELETEXT	= 0x3000002,
@@ -261,6 +262,7 @@
 	case AUDIO_AAC_LATM:
 	case AUDIO_DTS:
 	case AUDIO_TRUEHD:
+	case AUDIO_S302M:
 		return 1;
 	}
 	return 0;
@@ -893,6 +895,8 @@
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO AAC LATM(pid=%d)", param->apid);
 	else if(param->atype == AUDIO_TRUEHD)
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO TRUEHD(pid=%d)", param->apid);
+	else if(param->atype == AUDIO_S302M)
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO S302M(pid=%d)", param->apid);
 	else
 	{
 		audio_found = 0;
@@ -2354,6 +2358,10 @@
 				{
 					es->type = VIDEO_DIRAC;
 				}
+				else if(d[0] == 'B' && d[1] == 'S' && d[2] == 'S' && d[3] == 'D')
+				{
+					es->type = AUDIO_S302M;
+				}
 				else
 					es->type = UNKNOWN;
 				mp_msg(MSGT_DEMUX, MSGL_DBG2, "FORMAT %s\n", es->format_descriptor);