From 8558d03eb99cd3be50e1d49b02497f7e6a8c755a Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 31 Dec 2006 11:09:53 +0000 Subject: use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index b66e1aa62e..5d6b594be0 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1055,9 +1055,9 @@ int demuxer_get_current_time(demuxer_t *demuxer){ 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; } -- cgit v1.2.3