Mercurial > mplayer.hg

diff mplayer.c @ 26087:2a112aed0dda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Demuxer-independent subtitle track selection.
author eugeni
date Fri, 29 Feb 2008 17:25:44 +0000
parents 2cb4aabb7dd8
children c585e2ad8ebf
line wrap: on
line diff
--- a/mplayer.c	Fri Feb 29 17:25:43 2008 +0000
+++ b/mplayer.c	Fri Feb 29 17:25:44 2008 +0000
@@ -3444,6 +3444,8 @@
 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;