overlapping subtitles support is now optional, can be disabled (-nooverlapsub)

patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 1 insertions, 0 deletions

diff --git a/mplayer.c b/mplayer.c
index e1138e4e55..f51d4769ce 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -256,6 +256,7 @@ int   sub_auto = 1;
 char *vobsub_name=NULL;
 /*DSP!!char *dsp=NULL;*/
 int   subcc_enabled=0;
+int suboverlap_enabled = 1;
 #ifdef USE_SUB
 subtitle* subtitles=NULL;
 float sub_last_pts = -303;