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/options.c | |
| parent | 04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (diff) | |
| download | mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.bz2 mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.xz | |
player: add --merge-files option
Diffstat (limited to 'mpvcore/options.c')
| -rw-r--r-- | mpvcore/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mpvcore/options.c b/mpvcore/options.c index e8c82c447f..efb6b79569 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -694,6 +694,7 @@ const m_option_t mp_opts[] = { OPT_DOUBLE("chapter-seek-threshold", chapter_seek_threshold, 0), OPT_FLAG("load-unsafe-playlists", load_unsafe_playlists, 0), + OPT_FLAG("merge-files", merge_files, 0), // a-v sync stuff: OPT_FLAG("correct-pts", correct_pts, 0), |