[MPlayer-cvslog] r21798 - trunk/libmpdemux/demuxer.c

[nicodvb]

Author: nicodvb
Date: Sun Dec 31 12:09:53 2006
New Revision: 21798

Modified:
   trunk/libmpdemux/demuxer.c

Log:
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Sun Dec 31 12:09:53 2006
@@ -1055,9 +1055,9 @@
     double get_time_ans = 0;
     double tm;
     sh_video_t *sh_video = demuxer->video->sh;
-    if(stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_TIME,(void *)&tm)!=STREAM_UNSUPORTED) {
-        get_time_ans = tm;
-    } else if(sh_video) get_time_ans = sh_video->pts;
+    if(demuxer->stream_pts != MP_NOPTS_VALUE)
+        get_time_ans = demuxer->stream_pts;
+    else if(sh_video) get_time_ans = sh_video->pts;
     return (int) get_time_ans;
 }