# HG changeset patch # User reimar # Date 1159009678 0 # Node ID 15ae9558e41e4bb823abe09250eee84c0cacb969 # Parent 44193c0a688f51546532747acb3f0deb78a681ca Fix audio stream switching with demux_mkv: return value of demuxer_switch_audio is new stream number for -aid, the index in a_streams array is in demuxer->audio->id instead. diff -r 44193c0a688f -r 15ae9558e41e mplayer.c --- a/mplayer.c Sat Sep 23 10:42:03 2006 +0000 +++ b/mplayer.c Sat Sep 23 11:07:58 2006 +0000 @@ -5099,10 +5099,10 @@ case MP_CMD_SWITCH_AUDIO : { int current_id = demuxer->audio->id; int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i); - if(v > -1 && v < MAX_A_STREAMS && v != current_id) { + if(v > -1 && demuxer->audio->id != current_id) { sh_audio_t *sh2; uninit_player(INITED_AO | INITED_ACODEC); - sh2 = demuxer->a_streams[v]; + sh2 = demuxer->a_streams[demuxer->audio->id]; if(sh2) { sh2->ds = demuxer->audio; sh_audio = sh2;