RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

simplified assignment of subtitles stream in ts_parse() 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20522 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-10-29 21:29:23 +00:00
parent 9774de4be4
commit 6d60c545d4
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmpdemux/demux_ts.c
View File

@ -2747,17 +2747,11 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
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 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
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)