RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

- ignore movi_end if reading from stdin

Browse Source 
- assume I-only stream if no index (buggy seekable avi is still better than non-seekable)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9229 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-02-02 21:32:05 +00:00
parent 084dadc7dc
commit 42118815ee
1 changed files with 6 additions and 6 deletions

12
libmpdemux/demux_avi.c
View File

@ -182,7 +182,7 @@ int ret=0;
demux_stream_t *ds;
do{
int flags=0;
int flags=1;
AVIINDEXENTRY *idx=NULL;
#if 0
demux->filepos=stream_tell(demux->stream);
@ -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)){
if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->type!=STREAMTYPE_STREAM)){
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos);
continue;
}
@ -243,10 +243,10 @@ do{
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
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){
if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->type!=STREAMTYPE_STREAM)){
demux->stream->eof=1;
return 0;
}
@ -302,7 +302,7 @@ unsigned int len;
int ret=0;
do{
int flags=0;
int flags=1;
AVIINDEXENTRY *idx=NULL;
int idx_pos=0;
demux->filepos=stream_tell(demux->stream);
@ -354,7 +354,7 @@ do{
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0;
} else return 0;
ret=demux_avi_read_packet(demux,demux_avi_select_stream(demux,id),id,len,idx_pos,flags);
// if(!ret && priv->skip_video_frames<=0)