diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-05 17:13:47 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-05 17:13:47 +0000 |
| commit | fc50523f80ae3dafbea61b3af75c4f109e6fb6d8 (patch) | |
| tree | 0e857027154b24414ed87e0a556ee187e2f21bab /mplayer.c | |
| parent | c5b0ff1cfacfa502eb0647f329756ddf7c79fcb6 (diff) | |
| download | mpv-fc50523f80ae3dafbea61b3af75c4f109e6fb6d8.tar.bz2 mpv-fc50523f80ae3dafbea61b3af75c4f109e6fb6d8.tar.xz | |
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]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30515 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1082,9 +1082,9 @@ void add_subtitles(char *filename, float fps, int noerr) #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); |