diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /options/options.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'options/options.h')
| -rw-r--r-- | options/options.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/options/options.h b/options/options.h index fc37e98f8a..f465c0f862 100644 --- a/options/options.h +++ b/options/options.h @@ -10,6 +10,7 @@ typedef struct mp_vo_opts { struct m_obj_settings *video_driver_list; int taskbar_progress; + int snap_window; int ontop; int fullscreen; int border; @@ -50,7 +51,7 @@ typedef struct mp_vo_opts { // vo_wayland, vo_drm struct sws_opts *sws_opts; // vo_opengl, vo_opengl_cb - int hwdec_preload_api; + char *gl_hwdec_interop; // vo_drm char *drm_connector_spec; int drm_mode_id; @@ -136,8 +137,8 @@ typedef struct MPOpts { int video_osd; int untimed; - char *stream_capture; char *stream_dump; + char *record_file; int stop_playback_on_init_failure; int loop_times; int loop_file; @@ -213,12 +214,14 @@ typedef struct MPOpts { int forced_subs_only; int stretch_dvd_subs; int stretch_image_subs; + int image_subs_video_res; int sub_fix_timing; char **audio_files; char *demuxer_name; int demuxer_thread; + int prefetch_open; char *audio_demuxer_name; char *sub_demuxer_name; @@ -279,6 +282,7 @@ typedef struct MPOpts { int ass_style_override; int ass_hinting; int ass_shaper; + int ass_justify; int sub_clear_on_seek; int teletext_page; @@ -318,7 +322,10 @@ typedef struct MPOpts { char *ipc_path; char *input_file; + int wingl_dwm_flush; + struct gl_video_opts *gl_video_opts; + struct angle_opts *angle_opts; struct dvd_opts *dvd_opts; } MPOpts; |