summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-24 08:01:04 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-24 08:01:04 +0300
commit07e4261aa25b02826b7924b5595336ad78744d28 (patch)
tree5cf4f6317ff24444eff315480f62bc99d30c360f /libmpdemux
parent9b94b3fb309ae9c0817485b58125d92dbe3ff28d (diff)
downloadmpv-07e4261aa25b02826b7924b5595336ad78744d28.tar.bz2
mpv-07e4261aa25b02826b7924b5595336ad78744d28.tar.xz
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.
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 2 insertions, 2 deletions
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;
}