Mercurial > mplayer.hg

diff mplayer.c @ 34494:fede902a408c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Thu, 19 Jan 2012 23:20:37 +0000
parents ce8b1d7d54fe
children b85d4539ad07
line wrap: on
line diff
--- a/mplayer.c	Thu Jan 19 14:36:17 2012 +0000
+++ b/mplayer.c	Thu Jan 19 23:20:37 2012 +0000
@@ -3165,6 +3165,12 @@
         // setup global sub numbering
         mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub);
     }
+#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
 
 //============ Open & Sync STREAM --- fork cache2 ====================