summaryrefslogtreecommitdiffstats
path: root/core/options.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
committerwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
commite18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch)
tree199bddd30923db1175a1331191eb86ba684e9e41 /core/options.h
parent3e7d483ac89289f613138002be2043ec5f479bb0 (diff)
parent5ead20bdb3328d199dad693039d18e7a05eb2465 (diff)
downloadmpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2
mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also includes a branch of cleanups and some refactoring. Conflicts: stream/stream.c
Diffstat (limited to 'core/options.h')
-rw-r--r--core/options.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/options.h b/core/options.h
index 28932693ed..d7c3bd715e 100644
--- a/core/options.h
+++ b/core/options.h
@@ -106,7 +106,6 @@ typedef struct MPOpts {
float hr_seek_demuxer_offset;
float audio_delay;
float default_max_pts_correction;
- int ignore_start;
int autosync;
int softsleep;
int frame_dropping;
@@ -154,13 +153,13 @@ typedef struct MPOpts {
char *demuxer_name;
char *audio_demuxer_name;
char *sub_demuxer_name;
- int extension_parsing;
int mkv_subtitle_preroll;
struct image_writer_opts *screenshot_image_opts;
char *screenshot_template;
double force_fps;
+ int index_mode; // -1=untouched 0=don't use index 1=use (generate) index
struct mp_chmap audio_output_channels;
int audio_output_format;