diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:02:03 +0100 |
|---|---|---|
| committer | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:19:24 +0100 |
| commit | 8b83c8996686072bc743b112ae5cb3bf93aa33ed (patch) | |
| tree | b09ce6a7ff470b05006622f19914b3d39d2f7d9f /common/playlist.h | |
| parent | 5bcac8580df6fc62323136f756a3a6d1e754fe9c (diff) | |
| parent | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (diff) | |
| download | mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.bz2 mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.xz | |
Merge commit '559a400ac36e75a8d73ba263fd7fa6736df1c2da' into wm4-commits--merge-edition
This bumps libmpv version to 1.103
Diffstat (limited to 'common/playlist.h')
| -rw-r--r-- | common/playlist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/playlist.h b/common/playlist.h index d35fff6df3..a37c516519 100644 --- a/common/playlist.h +++ b/common/playlist.h @@ -101,8 +101,10 @@ int playlist_entry_to_index(struct playlist *pl, struct playlist_entry *e); int playlist_entry_count(struct playlist *pl); struct playlist_entry *playlist_entry_from_index(struct playlist *pl, int index); +struct mp_cancel; struct mpv_global; -struct playlist *playlist_parse_file(const char *file, struct mpv_global *global); +struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel, + struct mpv_global *global); void playlist_entry_unref(struct playlist_entry *e); |