diff options
author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-17 12:30:45 +0000 |
---|---|---|
committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-17 12:30:45 +0000 |
commit | b603289132cbe36dc57ab9f284742f5b47e6818e (patch) | |
tree | af802179660474434ab46bab525d70aec037987d /libmpdemux/demux_avi.c | |
parent | dd4befd76fd2e8a4c30681f8dae17186065cc8c8 (diff) | |
download | mpv-b603289132cbe36dc57ab9f284742f5b47e6818e.tar.bz2 mpv-b603289132cbe36dc57ab9f284742f5b47e6818e.tar.xz |
enable seeking in http streams
patch by Valentine Zaretsky <valik+mplayerdev@email.dp.ua>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11966 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_avi.c')
-rw-r--r-- | libmpdemux/demux_avi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 9f0be39285..c209e6a37c 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -214,7 +214,7 @@ do{ } 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 @@ do{ 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_t* demux_open_avi(demuxer_t* demuxer){ 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); |