diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-09 13:26:03 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-09 13:26:03 +0000 |
| commit | 833c6d0deda4f9a556034ad2ffb1483c89182a40 (patch) | |
| tree | ddaf79362144f5547dd7cb8666d29e649b872d8a /src | |
| parent | 10b439f9d117d24286b2917409c2727286f3811e (diff) | |
| download | xine-lib-833c6d0deda4f9a556034ad2ffb1483c89182a40.tar.gz xine-lib-833c6d0deda4f9a556034ad2ffb1483c89182a40.tar.bz2 | |
very very nice: fixing an old xine bug of slider bar positioning for
non-interleaved streams. (ep2_clone_war_p640.avi case)
CVS patchset: 3845
CVS date: 2003/01/09 13:26:03
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_avi.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index bc20f4126..782ec187a 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.144 2003/01/08 01:02:27 miguelfreitas Exp $ + * $Id: demux_avi.c,v 1.145 2003/01/09 13:26:03 miguelfreitas Exp $ * * demultiplexer for avi streams * @@ -1114,6 +1114,10 @@ static int demux_avi_next (demux_avi_t *this, int decoder_flags) { buf->extra_info->input_time = video_pts / 90000; buf->extra_info->input_pos = this->input->get_current_pos(this->input); + /* use video_frames-2 instead of video_frames-1 to fix problems with weird + non-interleaved streams */ + buf->extra_info->input_length = + this->avi->video_idx.vindex[this->avi->video_idx.video_frames - 2].pos; buf->extra_info->frame_number = this->avi->video_posf; buf->decoder_flags |= decoder_flags; diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index cb8cc3ab6..d9b8caf86 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.207 2003/01/08 01:02:32 miguelfreitas Exp $ + * $Id: xine.c,v 1.208 2003/01/09 13:26:03 miguelfreitas Exp $ * * top-level xine functions * @@ -750,8 +750,9 @@ static int xine_play_internal (xine_stream_t *stream, int start_pos, int start_t * start/seek demux */ if (start_pos) { + len = stream->current_extra_info->input_length; /* FIXME: do we need to protect concurrent access to input plugin here? */ - len = stream->input_plugin->get_length (stream->input_plugin); + if (len == 0) len = stream->input_plugin->get_length (stream->input_plugin); share = (double) start_pos / 65535; pos = (off_t) (share * len) ; } else |