RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 18:42:09 +00:00
Code Issues Releases Wiki Activity

demux_lavf: do not special case ID_TEXT subs on program switching

Browse Source 
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.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35117 b3059339-0415-0410-9bf9-f77b7e298cf2

Conflicts:
	libmpdemux/demux_lavf.c
This commit is contained in:
reimar 2012-08-25 10:50:50 +00:00 committed by wm4
parent ff08d0c34a
commit 570c907609
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/demux_lavf.c
View File

@ -1007,7 +1007,7 @@ redo:
prog->aid = program->stream_index[i];
break;
case AVMEDIA_TYPE_SUBTITLE:
if (prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT)
if (prog->sid == -2)
prog->sid = program->stream_index[i];
break;
}