summaryrefslogtreecommitdiffstats
path: root/sub/sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-29 11:03:53 +0200
committerwm4 <wm4@nowhere>2012-10-16 07:26:31 +0200
commit252ddcc014b7672a4434823fc6275be1b039bd79 (patch)
tree5bd84ef90f84a5b9c5a60d99eae2cedb3321207d /sub/sub.c
parente62b3a175016eaf93ef5ead7ea3891bc85327a55 (diff)
downloadmpv-252ddcc014b7672a4434823fc6275be1b039bd79.tar.bz2
mpv-252ddcc014b7672a4434823fc6275be1b039bd79.tar.xz
sub: cleanup: remove vo_osd_probar_type/value global variables
Diffstat (limited to 'sub/sub.c')
-rw-r--r--sub/sub.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sub/sub.c b/sub/sub.c
index 182215310f..8e80730b9a 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -66,8 +66,6 @@ int sub_bg_color=0; /* subtitles background color */
int sub_bg_alpha=0;
int sub_justify=0;
-int vo_osd_progbar_type=-1;
-int vo_osd_progbar_value=100; // 0..256
subtitle* vo_sub=NULL;
char *subtitle_font_encoding = NULL;
float text_font_scale_factor = 3.5;
@@ -113,6 +111,8 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
*osd = (struct osd_state) {
.opts = opts,
.ass_library = asslib,
+ .osd_text = talloc_strdup(osd, ""),
+ .progbar_type = -1,
};
for (int n = 0; n < MAX_OSD_PARTS; n++) {
struct osd_object *obj = talloc_struct(osd, struct osd_object, {
@@ -122,7 +122,6 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
obj->cache[i] = talloc_steal(obj, osd_conv_cache_new());
osd->objs[n] = obj;
}
- osd->osd_text = talloc_strdup(osd, "");
osd_init_backend(osd);
global_osd = osd;
return osd;