Demuxer-independent subtitle track selection.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/mplayer.c b/mplayer.c
index 7d676b1fd8..35943e3117 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3444,6 +3444,8 @@ if(mpctx->sh_video) {
 if (mpctx->global_sub_size) {
   // find the best sub to use
   int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id);
+  if (dvdsub_id < 0 && dvdsub_lang)
+    dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang);
   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_index_id;