diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-31 11:09:53 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-31 11:09:53 +0000 |
| commit | 8558d03eb99cd3be50e1d49b02497f7e6a8c755a (patch) | |
| tree | 04b309a1d2c8796cdfa7c6f993ed3d728169a1a8 /libmpdemux/demuxer.c | |
| parent | 33ce3088d18e9328cfb14f001373bebffee6610c (diff) | |
| download | mpv-8558d03eb99cd3be50e1d49b02497f7e6a8c755a.tar.bz2 mpv-8558d03eb99cd3be50e1d49b02497f7e6a8c755a.tar.xz | |
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
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |