[MPlayer-cvslog] r21832 - trunk/stream/stream_dvb.c

[nicodvb]

Author: nicodvb
Date: Sat Jan  6 12:09:27 2007
New Revision: 21832

Modified:
   trunk/stream/stream_dvb.c

Log:
don't add pid 0 if it's already present in the list

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Sat Jan  6 12:09:27 2007
@@ -133,7 +133,7 @@
 	char line[CHANNEL_LINE_LEN], *colon;
 
 	int fields, cnt, pcnt, k;
-	int has8192;
+	int has8192, has0;
 	dvb_channel_t *ptr, *tmp, chn;
 	char tmp_lcr[256], tmp_hier[256], inv[256], bw[256], cr[256], mod[256], transm[256], gi[256], vpid_str[256], apid_str[256];
 	const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
@@ -258,21 +258,20 @@
 		if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
 			continue;
 
-		has8192 = 0;
+		has8192 = has0 = 0;
 		for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
 		{
 			if(ptr->pids[cnt] == 8192)
-			{
 				has8192 = 1;
-				break;
-			}
+			if(ptr->pids[cnt] == 0)
+				has0 = 1;
 		}
 		if(has8192)
 		{
 			ptr->pids[0] = 8192;
 			ptr->pids_cnt = 1;
 		}
-		else
+		else if(! has0)
 		{
 			ptr->pids[ptr->pids_cnt] = 0;	//PID 0 is the PAT
 			ptr->pids_cnt++;