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.h | |
| parent | 04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (diff) | |
| download | mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.bz2 mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.xz | |
player: add --merge-files option
Diffstat (limited to 'mpvcore/options.h')
| -rw-r--r-- | mpvcore/options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mpvcore/options.h b/mpvcore/options.h index e6df87f4b8..62090cedd4 100644 --- a/mpvcore/options.h +++ b/mpvcore/options.h @@ -94,6 +94,7 @@ typedef struct MPOpts { int chapter_merge_threshold; double chapter_seek_threshold; int load_unsafe_playlists; + int merge_files; int quiet; int load_config; int use_filedir_conf; |