diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
tree | 89f2d90c5586560911e67c872b530c77f151168d /options/options.h | |
parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'options/options.h')
-rw-r--r-- | options/options.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/options.h b/options/options.h index 95268cd522..5dcc642222 100644 --- a/options/options.h +++ b/options/options.h @@ -9,9 +9,11 @@ typedef struct mp_vo_opts { struct m_obj_settings *video_driver_list, *vo_defs; + int taskbar_progress; int ontop; int fullscreen; int border; + int fit_border; int all_workspaces; int screen_id; |