Mercurial > mplayer.hg

diff mplayer.c @ 30473:7446f58b6899

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for loading ASS subtitles through the stream layer and thus e.g. from some network location. Patch by Yuriy Kaminskiy [yumkam mail ru]
author reimar
date Fri, 05 Feb 2010 17:13:47 +0000
parents c1a3f1bbba26
children a70589785d97
line wrap: on
line diff
--- a/mplayer.c	Fri Feb 05 16:42:13 2010 +0000
+++ b/mplayer.c	Fri Feb 05 17:13:47 2010 +0000
@@ -1082,9 +1082,9 @@
 #ifdef CONFIG_ASS
     if (ass_enabled)
 #ifdef CONFIG_ICONV
-        asst = ass_read_file(ass_library, filename, sub_cp);
+        asst = ass_read_stream(ass_library, filename, sub_cp);
 #else
-        asst = ass_read_file(ass_library, filename, 0);
+        asst = ass_read_stream(ass_library, filename, 0);
 #endif
     if (ass_enabled && subd && !asst)
         asst = ass_read_subdata(ass_library, subd, fps);