Mercurial > mplayer.hg

diff mencoder.c @ 31927:6e0b5a97e00f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
EOSD/ASS code factorization Move some code that was partially duplicated between vf_vo and vf_ass with subtle differences into a separate file.
author cigaes
date Mon, 23 Aug 2010 19:13:05 +0000
parents 8c6e90c5fcc4
children 67b33b7e3b4c
line wrap: on
line diff
--- a/mencoder.c	Sun Aug 22 23:38:40 2010 +0000
+++ b/mencoder.c	Mon Aug 23 19:13:05 2010 +0000
@@ -97,6 +97,7 @@
 #include "path.h"
 #include "spudec.h"
 #include "vobsub.h"
+#include "eosd.h"
 
 
 int vo_doublebuffering=0;
@@ -1052,10 +1053,11 @@
 #endif
 
     sh_video->vfilter=append_filters(sh_video->vfilter);
+  eosd_init(sh_video->vfilter);
 
 #ifdef CONFIG_ASS
   if (ass_enabled)
-    ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library);
+    eosd_ass_init(ass_library);
 #endif
 
 // after reading video params we should load subtitles because