From 38df52858309c881b07c31e6c1d4dcd8ec2408d7 Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Jun 2006 23:16:09 +0000
Subject: [PATCH] fixed wrong assignment of stream type in generic PES_PRIVATE1
 streams (didn't respect the type qualified in the PMT)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18565 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_ts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 448ab64ef0..d06b8acf71 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -1351,7 +1351,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es,
 			mp_msg(MSGT_DEMUX, MSGL_DBG2, "PES_PRIVATE1\n");
 			es->start   = p;
 			es->size    = packet_len;
-			es->type    = PES_PRIVATE1;
+			es->type    = (type_from_pmt == UNKNOWN ? PES_PRIVATE1 : type_from_pmt);
 			es->payload_size -= packet_len;
 
 			return 1;