diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-12 17:19:56 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-12 17:19:56 +0000 |
| commit | 6e28f63e36321ad554646b9598f2b1f258620b84 (patch) | |
| tree | be9a189de2782508013242fa38554493976351e2 /libmpdemux/demux_mpg.c | |
| parent | 72023719ba723203df4d07b979ea6c476524e187 (diff) | |
| download | mpv-6e28f63e36321ad554646b9598f2b1f258620b84.tar.bz2 mpv-6e28f63e36321ad554646b9598f2b1f258620b84.tar.xz | |
consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mpg.c')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 7bae4f3f74..07de9882bd 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -802,15 +802,11 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){ mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; - int msec = 0; switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: - msec = stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg); - if(msec != STREAM_UNSUPORTED) { - msec = *((unsigned int*)arg); - *((double *)arg)=(double)msec/1000.0f; - mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, stream len: %d (%.3lf)\r\n", msec, *((double*)arg)); + if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg) != STREAM_UNSUPORTED) { + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3lf)\r\n", *((double*)arg)); return DEMUXER_CTRL_GUESS; } if (mpg_d && mpg_d->has_valid_timestamps) { |