diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /libvo/vo_caca.c | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'libvo/vo_caca.c')
| -rw-r--r-- | libvo/vo_caca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index caf84c6e5f..2d998bf91d 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -325,9 +325,9 @@ static void uninit(struct vo *vo) static void draw_osd(struct vo *vo, struct osd_state *osd) { - if (vo_osd_progbar_type != -1) - osdpercent(MESSAGE_DURATION, 0, 255, vo_osd_progbar_value, - sub_osd_names[vo_osd_progbar_type], ""); + if (osd->progbar_type != -1) + osdpercent(MESSAGE_DURATION, 0, 255, osd->progbar_value, + sub_osd_names[osd->progbar_type], ""); } static int preinit(struct vo *vo, const char *arg) |