diff options
author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /options.h | |
parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.c
Diffstat (limited to 'options.h')
-rw-r--r-- | options.h | 7 |
1 files changed, 6 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; @@ -158,6 +160,7 @@ typedef struct MPOpts { int use_lircc; int use_ar; // apple remote int default_bindings; + int test; } input; struct encode_output_conf { @@ -176,6 +179,8 @@ typedef struct MPOpts { int rawts; int autofps; int neverdrop; + int video_first; + int audio_first; } encode_output; } MPOpts; |