[MPlayer-cvslog] r20522 - trunk/libmpdemux/demux_ts.c

[nicodvb]

Author: nicodvb
Date: Sun Oct 29 22:29:23 2006
New Revision: 20522

Modified:
   trunk/libmpdemux/demux_ts.c

Log:
simplified assignment of subtitles stream in ts_parse()

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	(original)
+++ trunk/libmpdemux/demux_ts.c	Sun Oct 29 22:29:23 2006
@@ -2747,17 +2747,11 @@
 
 						if(dvdsub_lang)
 						{
-							if(!strcmp(dvdsub_lang, ""))
-								asgn = 1;
-							else
-							{
-								lang = pid_lang_from_pmt(priv, pid);
-								if(lang != NULL)
-									asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
-								else
-									asgn = 0;
-							}
+							if(lang = pid_lang_from_pmt(priv, pid))
+								asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
 						}
+						else		//no language specified with -slang
+							asgn = 1;
 
 						if(asgn)
 						{
@@ -2765,10 +2759,6 @@
 							mp_msg(MSGT_DEMUX, MSGL_INFO, "CHOSEN SUBs pid 0x%x (%d) FROM PROG %d\n", tss->pid, tss->pid, priv->prog);
 						}
 					}
-					else
-					{
-						mp_msg(MSGT_DEMUX, MSGL_V, "DISCARDED SUBs pid 0x%x (%d) NOT CHOSEN OR NOT IN PROG %d\n", tss->pid, tss->pid, priv->prog);
-					}
 				}
 
 				if(demuxer->sub->id == tss->pid)