diff options
| author | wm4 <wm4@nowhere> | 2013-11-19 22:36:33 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-19 22:39:14 +0100 |
| commit | f197198ca3e79b923e5d0ae66fec847737ee1f41 (patch) | |
| tree | 71ca40697b7e0bb0d7873d81246b82d987a92439 /mpvcore/player/mp_core.h | |
| parent | 04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (diff) | |
| download | mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.bz2 mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.xz | |
player: add --merge-files option
Diffstat (limited to 'mpvcore/player/mp_core.h')
| -rw-r--r-- | mpvcore/player/mp_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h index 4e0dede812..2ea65f54be 100644 --- a/mpvcore/player/mp_core.h +++ b/mpvcore/player/mp_core.h @@ -376,6 +376,7 @@ double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t, double fallback_time); double get_play_end_pts(struct MPContext *mpctx); double get_relative_time(struct MPContext *mpctx); +void merge_playlist_files(struct playlist *pl); int mp_get_cache_percent(struct MPContext *mpctx); bool mp_get_cache_idle(struct MPContext *mpctx); void update_window_title(struct MPContext *mpctx, bool force); |