RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid crash if a non-existent audio track is selected with -aid 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23790 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-07-16 14:01:53 +00:00
parent 4ab613d1a3
commit 434cf0c9eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmpdemux/demux_mkv.c
View File

@ -2520,6 +2520,11 @@ demux_mkv_open (demuxer_t *demuxer)
else if (demuxer->audio->id != -2) /* -2 = no audio at all */
track = demux_mkv_find_track_by_num (mkv_d, demuxer->audio->id,
MATROSKA_TRACK_AUDIO);
if (track && demuxer->a_streams[track->tnum])
{
demuxer->audio->id = track->tnum;
demuxer->audio->sh = demuxer->a_streams[track->tnum];
}
else
{
mp_msg (MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_MKV_NoAudioTrackFound);
@ -2534,11 +2539,6 @@ demux_mkv_open (demuxer_t *demuxer)
continue;
if(demuxer->a_streams[track->tnum])
{
if(track && mkv_d->tracks[i] == track)
{
demuxer->audio->id = track->tnum;
demuxer->audio->sh = demuxer->a_streams[track->tnum];
}
mkv_d->last_aid++;
if(mkv_d->last_aid == MAX_A_STREAMS)
break;