summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-03 04:08:36 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-03 04:08:36 +0000
commit0f04ca9adf7f6395d2038c3087a9639926e05ab8 (patch)
tree1b2c2d4b70dc6a712644ffc1ea95163b94dc3d7a /mplayer.c
parent442a101a52f16cd5961d0dc8f5398624a13f5f56 (diff)
downloadmpv-0f04ca9adf7f6395d2038c3087a9639926e05ab8.tar.bz2
mpv-0f04ca9adf7f6395d2038c3087a9639926e05ab8.tar.xz
Skip empty vobsub streams when selecting subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25279 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 4f3c507227..a04637a400 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3172,9 +3172,10 @@ if(mpctx->sh_video) {
if (mpctx->global_sub_size) {
// find the best sub to use
- if (vobsub_id >= 0) {
+ int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id);
+ if (vobsub_index_id >= 0) {
// if user asks for a vobsub id, use that first.
- mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_id;
+ mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_index_id;
} else if (dvdsub_id >= 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
// if user asks for a dvd sub id, use that next.
mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;