summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv_timeline.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-06 20:09:18 +0200
committerwm4 <wm4@nowhere>2016-09-06 20:09:18 +0200
commite66c098228320bdcc13ca975125f7b98b0f23219 (patch)
treebc448ca0a6be197603ab3a43be82721f2c64b139 /demux/demux_mkv_timeline.c
parent618d7f59b0baa95f2151f45a6026de4d7dace4aa (diff)
downloadmpv-e66c098228320bdcc13ca975125f7b98b0f23219.tar.bz2
mpv-e66c098228320bdcc13ca975125f7b98b0f23219.tar.xz
demux_mkv: don't crash if --ordered-chapters-files fails
It just crashed.
Diffstat (limited to 'demux/demux_mkv_timeline.c')
-rw-r--r--demux/demux_mkv_timeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index 8affe13ac2..256e009753 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -260,7 +260,7 @@ static void find_ordered_chapter_sources(struct tl_ctx *ctx)
struct playlist *pl =
playlist_parse_file(opts->ordered_chapters_files, ctx->global);
talloc_steal(tmp, pl);
- for (struct playlist_entry *e = pl->first; e; e = e->next)
+ for (struct playlist_entry *e = pl ? pl->first : NULL; e; e = e->next)
MP_TARRAY_APPEND(tmp, filenames, num_filenames, e->filename);
} else if (ctx->demuxer->stream->uncached_type != STREAMTYPE_FILE) {
MP_WARN(ctx, "Playback source is not a "