summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-23 21:21:58 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-23 21:21:58 +0000
commitbf16f6f4f329b7903ba550c458545fbdb41f5314 (patch)
treeb9009935031d204f281367db020e88edb6e50702 /mencoder.c
parent4834e2116289f92edc49dc8e595e70adcdc26cec (diff)
downloadmpv-bf16f6f4f329b7903ba550c458545fbdb41f5314.tar.bz2
mpv-bf16f6f4f329b7903ba550c458545fbdb41f5314.tar.xz
Make update_subtitles work without sh_video for text subtitles.
This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index 5b569bb5fd..8d43106fde 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1454,7 +1454,7 @@ if(sh_audio && !demuxer2){
}
else
#endif
- update_subtitles(sh_video, d_dvdsub, 0);
+ update_subtitles(sh_video, sh_video->pts, d_dvdsub, 0);
frame_data = (s_frame_data){ .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 };