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/main.c | |
| parent | 04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (diff) | |
| download | mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.bz2 mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.xz | |
player: add --merge-files option
Diffstat (limited to 'mpvcore/player/main.c')
| -rw-r--r-- | mpvcore/player/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c index 34383f4264..4119e244c3 100644 --- a/mpvcore/player/main.c +++ b/mpvcore/player/main.c @@ -419,6 +419,9 @@ static int mpv_main(int argc, char *argv[]) if (opts->shuffle) playlist_shuffle(mpctx->playlist); + if (opts->merge_files) + merge_playlist_files(mpctx->playlist); + mpctx->playlist->current = mp_resume_playlist(mpctx->playlist, opts); if (!mpctx->playlist->current) mpctx->playlist->current = mpctx->playlist->first; |