diff options
| author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
| commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
| tree | 211177793cd5d6b399346be661af8e7528f0f411 /options.h | |
| parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
| parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
| download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz | |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'options.h')
| -rw-r--r-- | options.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -41,7 +41,6 @@ typedef struct MPOpts { int osd_duration; int osd_fractions; char *vobsub_name; - int auto_quality; int untimed; int loop_times; int ordered_chapters; @@ -61,9 +60,11 @@ typedef struct MPOpts { float hr_seek_demuxer_offset; int autosync; int softsleep; + int frame_dropping; int term_osd; char *term_osd_esc; char *playing_msg; + char *status_msg; int player_idle_mode; int consolecontrols; int doubleclick_time; @@ -115,6 +116,7 @@ typedef struct MPOpts { char *ass_color; char *ass_border_color; char *ass_styles_file; + int ass_style_override; int ass_hinting; struct lavc_param { int workaround_bugs; |