From 9786d386679e814f814fc0eb2426086c1f3fd16e Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 9 Mar 2010 22:35:53 +0200 Subject: subs: support loading external ASS subtitles via stream layer Previously the argument of the "-sub" option was always interpreted as a local filename when trying to read it as a libass file. Use the stream layer to read it instead, so that protocols like 'http://' are also supported like they are for the main video/audio file. Based on patch by Yuriy Kaminskiy --- mplayer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index cc8dc825e3..f99f426746 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1117,9 +1117,9 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr #ifdef CONFIG_ASS if (opts->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 (!asst) { subd = sub_read_file(filename, fps); -- cgit v1.2.3