Mercurial > mplayer.hg

diff mplayer.c @ 19401:c0c3a2f8bb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add subdata to ass_track conversion for external subtitles.
author eugeni
date Tue, 15 Aug 2006 19:25:46 +0000
parents 64f9a6ce71e1
children e451718727d9
line wrap: on
line diff
--- a/mplayer.c	Tue Aug 15 14:50:24 2006 +0000
+++ b/mplayer.c	Tue Aug 15 19:25:46 2006 +0000
@@ -814,6 +814,9 @@
 #ifdef USE_ASS
     if (ass_enabled)
         asst = ass_read_file(filename);
+    if (ass_enabled && !asst)
+        asst = ass_read_subdata(subd, fps);
+
     if (!asst && !subd && !silent)
 #else
     if(!subd && !silent)