summaryrefslogtreecommitdiffstats
path: root/mpcommon.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 /mpcommon.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 'mpcommon.c')
-rw-r--r--mpcommon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mpcommon.c b/mpcommon.c
index 332d8e1cf4..55e3cef19c 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -195,6 +195,8 @@ int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang)
{
if (audio_id == -1 && audio_lang)
audio_id = demuxer_audio_track_by_lang(demuxer, audio_lang);
+ if (audio_id == -1)
+ audio_id = demuxer_default_audio_track(demuxer);
if (audio_id != -1) // -1 (automatic) is the default behaviour of demuxers
demuxer_switch_audio(demuxer, audio_id);
if (audio_id == -2) { // some demuxers don't yet know how to switch to no sound