diff options
author | Marton Balint <cus@passwd.hu> | 2013-06-15 18:26:22 +0200 |
---|---|---|
committer | Marton Balint <cus@passwd.hu> | 2013-06-17 01:18:07 +0200 |
commit | 05f0d53170d9f6cce34ed2e12b5749f4a4db6cac (patch) | |
tree | 991338aaca4618c1f9f81f96096b2722dee1b98b | |
parent | f73d6d2af7a2b30a647d945b590962a2ab54ff3b (diff) | |
download | ffmpeg-05f0d53170d9f6cce34ed2e12b5749f4a4db6cac.tar.gz |
ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles
Fixes regression with subtitles introduced in f2175a6.
Fixes ticket #2666.
Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r-- | ffplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1429,8 +1429,8 @@ retry: else sp2 = NULL; - if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000))) - || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000)))) + if ((is->vidclk.pts > (sp->pts + ((float) sp->sub.end_display_time / 1000))) + || (sp2 && is->vidclk.pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000)))) { free_subpicture(sp); |