From 07e4261aa25b02826b7924b5595336ad78744d28 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 24 May 2010 08:01:04 +0300 Subject: demux_mkv: fix crash bug introduced by recent change Commit fc39d48465 ("demux_mkv: store streams sequentially in demuxer->[avs]_streams") had a simple bug in automatic stream selection causing a crash if no video or audio track was marked as 'default'. Fix. --- libmpdemux/demux_mkv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index d4a3a8994a..c5e17ea43f 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1722,7 +1722,7 @@ static int demux_mkv_open(demuxer_t *demuxer) /* let's take the first video track */ for (i = 0; i < mkv_d->num_tracks; i++) if (mkv_d->tracks[i]->type == MATROSKA_TRACK_VIDEO - && track->id >= 0) { + && mkv_d->tracks[i]->id >= 0) { track = mkv_d->tracks[i]; break; } @@ -1756,7 +1756,7 @@ static int demux_mkv_open(demuxer_t *demuxer) /* let's take the first audio track */ for (i = 0; i < mkv_d->num_tracks; i++) if (mkv_d->tracks[i]->type == MATROSKA_TRACK_AUDIO - && track->id >= 0) { + && mkv_d->tracks[i]->id >= 0) { track = mkv_d->tracks[i]; break; } -- cgit v1.2.3