diff mencoder.c @ 34494:fede902a408c

Fix per-file ASS options like -ass-force-style. Previously the per-file settings were (sometimes at least) completely ignored and only the global ones used.

--- a/mencoder.c	Thu Jan 19 14:36:17 2012 +0000
+++ b/mencoder.c	Thu Jan 19 23:20:37 2012 +0000
@@ -638,6 +638,16 @@
 	mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_MissingFilename);
 	mencoder_exit(1,NULL);
   }
+
+  if (vobsub_name)
+    vo_vobsub = vobsub_open(vobsub_name, spudec_ifo, 1, &vo_spudec);
+#ifdef CONFIG_ASS
+  // must be before demuxer open, since the settings are
+  // used in generating the ASSTrack
+  if (ass_enabled && ass_library)
+    ass_mp_reset_config(ass_library);
+#endif
+
   stream=open_stream(filename,0,&file_format);
 
   if(!stream){
@@ -769,9 +779,6 @@
     }
   }
 
-  if (vobsub_name)
-    vo_vobsub = vobsub_open(vobsub_name, spudec_ifo, 1, &vo_spudec);
-
 // set up video encoder:
 
 if (!curfile) { // curfile is non zero when a second file is opened