# HG changeset patch # User zuxy # Date 1182086932 0 # Node ID ba9e664dbbaa645d9e884a2f823a618c74d16817 # Parent 63d9b7032bf36a060e9dd6d441bf797fcd3263a4 More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH control diff -r 63d9b7032bf3 -r ba9e664dbbaa libmpdemux/demuxer.c --- a/libmpdemux/demuxer.c Sun Jun 17 12:18:13 2007 +0000 +++ b/libmpdemux/demuxer.c Sun Jun 17 13:28:52 2007 +0000 @@ -1038,7 +1038,9 @@ sh_audio_t *sh_audio = demuxer->audio->sh; // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW if (demux_control(demuxer, DEMUXER_CTRL_GET_TIME_LENGTH,(void *)&get_time_ans)<=0) { - if (sh_video && sh_video->i_bps) + if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps) + get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/(sh_video->i_bps+sh_audio->i_bps); + else if (sh_video && sh_video->i_bps) get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_video->i_bps; else if (sh_audio && sh_audio->i_bps) get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_audio->i_bps;