[MPlayer-cvslog] r26120 - in trunk/libmpdemux: demux_lavf.c demux_mkv.c demuxer.c

[eugeni]

Author: eugeni
Date: Fri Feb 29 18:25:47 2008
New Revision: 26120

Log:
Don't select subtitle track in lavf and mkv demuxers.


Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Fri Feb 29 18:25:47 2008
@@ -433,13 +433,6 @@ static void handle_stream(demuxer_t *dem
             }
             if (st->language)
               sh_sub->lang = strdup(st->language);
-            if (demuxer->sub->id == -1
-                || (demuxer->sub->id == -2 && (dvdsub_lang && st->language[0] && !strncmp(dvdsub_lang, st->language, 3)))
-                || demuxer->sub->id == priv->sub_streams) {
-                dvdsub_id = priv->sub_streams;
-                demuxer->sub->id = priv->sub_streams;
-                demuxer->sub->sh = sh_sub;
-            }
             priv->sub_streams++;
             break;
         }

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Fri Feb 29 18:25:47 2008
@@ -2475,27 +2475,6 @@ demux_mkv_open (demuxer_t *demuxer)
 
   demux_mkv_parse_vobsub_data (demuxer);
 
-  /* DO NOT automatically select a subtitle track and behave like DVD */
-  /* playback: only show subtitles if the user explicitely wants them. */
-  track = NULL;
-  if (demuxer->sub->id >= 0)
-    track = demux_mkv_find_track_by_num (mkv_d, demuxer->sub->id,
-                                         MATROSKA_TRACK_SUBTITLE);
-  else if (dvdsub_lang != NULL)
-    track = demux_mkv_find_track_by_language (mkv_d, dvdsub_lang,
-                                              MATROSKA_TRACK_SUBTITLE);
-
-  if (track)
-          {
-            mp_msg (MSGT_DEMUX, MSGL_INFO,
-                    MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack, track->tnum);
-	    dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE);
-            demuxer->sub->id = track->tnum;
-            demuxer->sub->sh = demuxer->s_streams[track->tnum];
-          }
-  else
-    demuxer->sub->id = -2;
-
   if (demuxer->chapters)
     {
       for (i=0; i < (int)demuxer->num_chapters; i++)

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Fri Feb 29 18:25:47 2008
@@ -241,10 +241,6 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demu
     demuxer->s_streams[id] = sh;
     sh->sid = sid;
     mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
-    if (dvdsub_id == id) {
-      demuxer->sub->id = id;
-      demuxer->sub->sh = sh;
-    }
   }
   return demuxer->s_streams[id];
 }