diff options
| author | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-04 05:23:46 +0000 |
|---|---|---|
| committer | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-04 05:23:46 +0000 |
| commit | ecd1cd4168aeeccfaedf9395825d99ea164c9361 (patch) | |
| tree | 9382da66754eea2fb85ba60c3ba9a212daf72153 /mplayer.c | |
| parent | e98794e2ee07eb01f52e04dda4391c352643fe7c (diff) | |
| download | mpv-ecd1cd4168aeeccfaedf9395825d99ea164c9361.tar.bz2 mpv-ecd1cd4168aeeccfaedf9395825d99ea164c9361.tar.xz | |
Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]
must be zero when use a dvdsub_id greater than max sub id from demux.
To remove the implicit assumption, make it up here.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24962 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3019,7 +3019,9 @@ if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_D maxid = FFMAX(maxid, ((sh_sub_t *)mpctx->demuxer->s_streams[i])->sid); mpctx->global_sub_size += maxid + 1; } -if (mpctx->global_sub_size <= dvdsub_id) mpctx->global_sub_size = dvdsub_id + 1; +// Make dvdsub_id always selectable if set. +if (mpctx->global_sub_size <= mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id) + mpctx->global_sub_size = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id + 1; current_module="demux_open2"; |