Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 35023:6077de703cf4
When switching programs select subtitle stream regardless of
whether the format is text, ASS, bitmap or whatever.
There probably was some good reason for the condition but
it got lost in time and special-casing CODEC_ID_TEXT over other
test-based subtitles doesn't seem to make much sense.
| author | reimar |
|---|---|
| date | Sat, 25 Aug 2012 10:50:50 +0000 |
| parents | 4d94558867d6 |
| children | 60c7713b1061 |
comparison
equal
deleted
inserted
replaced
| 35022:3ac4db5f0f3e | 35023:6077de703cf4 |
|---|---|
| 810 case AVMEDIA_TYPE_AUDIO: | 810 case AVMEDIA_TYPE_AUDIO: |
| 811 if(prog->aid == -2) | 811 if(prog->aid == -2) |
| 812 prog->aid = program->stream_index[i]; | 812 prog->aid = program->stream_index[i]; |
| 813 break; | 813 break; |
| 814 case AVMEDIA_TYPE_SUBTITLE: | 814 case AVMEDIA_TYPE_SUBTITLE: |
| 815 if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT) | 815 if(prog->sid == -2) |
| 816 prog->sid = program->stream_index[i]; | 816 prog->sid = program->stream_index[i]; |
| 817 break; | 817 break; |
| 818 } | 818 } |
| 819 } | 819 } |
| 820 if (prog->aid >= 0 && prog->aid < MAX_A_STREAMS && | 820 if (prog->aid >= 0 && prog->aid < MAX_A_STREAMS && |