[FFmpeg-cvslog] ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles

Marton Balint git at videolan.org
Mon Jun 17 02:51:47 CEST 2013


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Jun 15 18:26:22 2013 +0200| [05f0d53170d9f6cce34ed2e12b5749f4a4db6cac] | committer: Marton Balint

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 at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05f0d53170d9f6cce34ed2e12b5749f4a4db6cac
---

 ffplay.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 65b7cb0..ae99146 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -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);
 



More information about the ffmpeg-cvslog mailing list