Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 26088:12904c37c798
Don't select subtitle track in lavf and mkv demuxers.
author | eugeni |
---|---|
date | Fri, 29 Feb 2008 17:25:47 +0000 |
parents | ec5749eb6f5f |
children | 8732f2107b56 |
comparison
equal
deleted
inserted
replaced
26087:2a112aed0dda | 26088:12904c37c798 |
---|---|
431 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); | 431 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); |
432 sh_sub->extradata_len = codec->extradata_size; | 432 sh_sub->extradata_len = codec->extradata_size; |
433 } | 433 } |
434 if (st->language) | 434 if (st->language) |
435 sh_sub->lang = strdup(st->language); | 435 sh_sub->lang = strdup(st->language); |
436 if (demuxer->sub->id == -1 | |
437 || (demuxer->sub->id == -2 && (dvdsub_lang && st->language[0] && !strncmp(dvdsub_lang, st->language, 3))) | |
438 || demuxer->sub->id == priv->sub_streams) { | |
439 dvdsub_id = priv->sub_streams; | |
440 demuxer->sub->id = priv->sub_streams; | |
441 demuxer->sub->sh = sh_sub; | |
442 } | |
443 priv->sub_streams++; | 436 priv->sub_streams++; |
444 break; | 437 break; |
445 } | 438 } |
446 case CODEC_TYPE_ATTACHMENT:{ | 439 case CODEC_TYPE_ATTACHMENT:{ |
447 if (st->codec->codec_id == CODEC_ID_TTF) | 440 if (st->codec->codec_id == CODEC_ID_TTF) |