From 2afd7ebb4e96b91cc552fff5badf237dadb28212 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Oct 2012 16:15:52 +0200 Subject: options: remove subtitle related options that did nothing Most of these cased working when the OSD was switched to libass, or didn't do anything even before that. Also don't recursively include subreader.h in sub.h. --- sub/sub.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sub/sub.c') diff --git a/sub/sub.c b/sub/sub.c index 8281081334..04fbcd877c 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -39,6 +39,7 @@ #include "img_convert.h" #include "draw_bmp.h" #include "spudec.h" +#include "subreader.h" char * const sub_osd_names[]={ @@ -58,21 +59,12 @@ char * const sub_osd_names[]={ }; char * const sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" }; -int sub_unicode=0; int sub_utf8=0; int sub_pos=100; -int sub_width_p=100; int sub_visibility=1; -int sub_bg_color=0; /* subtitles background color */ -int sub_bg_alpha=0; -int sub_justify=0; subtitle* vo_sub=NULL; -char *subtitle_font_encoding = NULL; float text_font_scale_factor = 3.5; -float osd_font_scale_factor = 4.0; -float subtitle_font_radius = 2.0; -float subtitle_font_thickness = 2.0; // 0 = no autoscale // 1 = video height // 2 = video width -- cgit v1.2.3