Mercurial > mplayer.hg

diff libmpdemux/demux_mkv.c @ 26269:65ad20416dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support 'default' attribute for audio and subtitle tracks. The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all.
author eugeni
date Sun, 30 Mar 2008 16:55:46 +0000
parents 835f8ba52075
children 664b4467564d
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c	Sat Mar 29 15:51:05 2008 +0000
+++ b/libmpdemux/demux_mkv.c	Sun Mar 30 16:55:46 2008 +0000
@@ -1849,6 +1849,7 @@
 
   if (track->language && (strcmp(track->language, "und") != 0))
     sh_a->lang = strdup(track->language);
+  sh_a->default_track = track->default_track;
   sh_a->ds = demuxer->audio;
   sh_a->wf = malloc (sizeof (WAVEFORMATEX));
   if (track->ms_compat && (track->private_size >= sizeof(WAVEFORMATEX)))
@@ -2217,6 +2218,7 @@
       sh->extradata_len = track->private_size;
       if (track->language && (strcmp(track->language, "und") != 0))
         sh->lang = strdup(track->language);
+      sh->default_track = track->default_track;
     }
   else
     {