Mercurial > mplayer.hg

comparison mencoder.c @ 8361:2202c00001e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
overlapping subtitles support is now optional, can be disabled (-nooverlapsub) patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>
author arpi
date Thu, 05 Dec 2002 00:03:35 +0000
parents ea3c66c6665f
children fb88ccbc5ccc
comparison
equal deleted inserted replaced
8360:ad75993b8deb 8361:2202c00001e3
160 char *sub_name=NULL; 160 char *sub_name=NULL;
161 float sub_delay=0; 161 float sub_delay=0;
162 float sub_fps=0; 162 float sub_fps=0;
163 int sub_auto = 0; 163 int sub_auto = 0;
164 int subcc_enabled=0; 164 int subcc_enabled=0;
165 int suboverlap_enabled = 1;
165 166
166 #ifdef USE_SUB 167 #ifdef USE_SUB
167 static subtitle* subtitles=NULL; 168 static subtitle* subtitles=NULL;
168 float sub_last_pts = -303; 169 float sub_last_pts = -303;
169 #endif 170 #endif