summaryrefslogtreecommitdiffstats
path: root/core/options.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-25 00:43:04 +0200
committerwm4 <wm4@nowhere>2013-06-25 00:43:04 +0200
commit403a266d466850621397c07e0b96cc2c493b2936 (patch)
tree0835a0908b3df8cca8374d173c34e0bf7df7d842 /core/options.h
parent536871d7e5848eb385b97202a33b9382b5e8ab0e (diff)
parent54851d60614e912fc422658302d72811a31b80f8 (diff)
downloadmpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2
mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz
Merge branch 'sub_mess2'
...the return.
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 f925990a6c..0c6f6c7271 100644
--- a/core/options.h
+++ b/core/options.h
@@ -141,17 +141,16 @@ typedef struct MPOpts {
int sub_pos;
float sub_delay;
float sub_fps;
+ float sub_speed;
int forced_subs_only;
char *quvi_format;
// subreader.c
int suboverlap_enabled;
char *sub_cp;
- int sub_no_text_pp;
char *audio_stream;
int audio_stream_cache;
- char *sub_stream;
char *demuxer_name;
char *audio_demuxer_name;
char *sub_demuxer_name;