summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-30 16:55:46 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-30 16:55:46 +0000
commit7cc46c2e87348423b7d97cf55fdb992404e3a7e8 (patch)
tree23df08556ce4a5ecd03efd357ca82630adc2e661 /libmpdemux/demux_mkv.c
parent37d20cbc938f4e09bbbd9141d7456c3949aea312 (diff)
downloadmpv-7cc46c2e87348423b7d97cf55fdb992404e3a7e8.tar.bz2
mpv-7cc46c2e87348423b7d97cf55fdb992404e3a7e8.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index d115da2f1f..fad06ef4c3 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1849,6 +1849,7 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track, int aid)
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 @@ demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track, int sid)
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
{