Mercurial > mplayer.hg
diff libmpdemux/demux_avi.c @ 11965:3d75bcc28231
enable seeking in http streams
patch by Valentine Zaretsky <valik+mplayerdev@email.dp.ua>
author | attila |
---|---|
date | Tue, 17 Feb 2004 12:30:45 +0000 |
parents | 9767665d49e0 |
children | 2c2fb4457982 |
line wrap: on
line diff
--- a/libmpdemux/demux_avi.c Tue Feb 17 11:22:32 2004 +0000 +++ b/libmpdemux/demux_avi.c Tue Feb 17 12:30:45 2004 +0000 @@ -214,7 +214,7 @@ } pos = priv->idx_offset + (unsigned long)idx->dwChunkOffset; - if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->type!=STREAMTYPE_STREAM)){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos); continue; } @@ -246,7 +246,7 @@ if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; } else { demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->type!=STREAMTYPE_STREAM)){ + if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){ demux->stream->eof=1; return 0; } @@ -449,7 +449,7 @@ demuxer->priv=(void*)priv; //---- AVI header: - read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2); + read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK)?index_mode:-2); if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id);