diff options
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_libarchive.c | 3 | ||||
| -rw-r--r-- | demux/demux_mkv_timeline.c | 6 | ||||
| -rw-r--r-- | demux/demux_playlist.c | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/demux/demux_libarchive.c b/demux/demux_libarchive.c index f2e669aa72..b038e149d9 100644 --- a/demux/demux_libarchive.c +++ b/demux/demux_libarchive.c @@ -82,8 +82,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) for (int n = 0; n < num_files; n++) playlist_add_file(pl, files[n]); - for (struct playlist_entry *e = pl->first; e; e = e->next) - e->stream_flags = demuxer->stream_origin; + playlist_set_stream_flags(pl, demuxer->stream_origin); demuxer->filetype = "archive"; demuxer->fully_read = true; diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index 22d859c75c..1062aa3685 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -258,8 +258,10 @@ static void find_ordered_chapter_sources(struct tl_ctx *ctx) playlist_parse_file(opts->ordered_chapters_files, ctx->tl->cancel, ctx->global); talloc_steal(tmp, pl); - for (struct playlist_entry *e = pl ? pl->first : NULL; e; e = e->next) - MP_TARRAY_APPEND(tmp, filenames, num_filenames, e->filename); + for (int n = 0; n < pl->num_entries; n++) { + MP_TARRAY_APPEND(tmp, filenames, num_filenames, + pl->entries[n]->filename); + } } else if (!ctx->demuxer->stream->is_local_file) { MP_WARN(ctx, "Playback source is not a " "normal disk file. Will not search for related files.\n"); diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index b40beda980..417642e75a 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -462,8 +462,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) bool ok = fmt->parse(p) >= 0 && !p->error; if (p->add_base) playlist_add_base_path(p->pl, mp_dirname(demuxer->filename)); - for (struct playlist_entry *e = p->pl->first; e; e = e->next) - e->stream_flags = demuxer->stream_origin; + playlist_set_stream_flags(p->pl, demuxer->stream_origin); demuxer->playlist = talloc_steal(demuxer, p->pl); demuxer->filetype = p->format ? p->format : fmt->name; demuxer->fully_read = true; |