summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-15 19:25:46 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-15 19:25:46 +0000
commite3bf2d734301f7dd1000725b70911723fe60c140 (patch)
tree0867f125420e9b097bf225d96590b0e702a979b4 /mplayer.c
parent37790bdbc48816f8c57643ae12b9e38f3d33c8f5 (diff)
downloadmpv-e3bf2d734301f7dd1000725b70911723fe60c140.tar.bz2
mpv-e3bf2d734301f7dd1000725b70911723fe60c140.tar.xz
Add subdata to ass_track conversion for external subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 0ac790bf2d..ed6de20f4c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -814,6 +814,9 @@ void add_subtitles(char *filename, float fps, int silent)
#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)