diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-24 00:50:54 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-24 00:50:54 +0000 |
| commit | e5f9e5b0573a9b1175fae0656bddf4daa4d3744f (patch) | |
| tree | 8084e5989e767baadca6f6ca6308ba0c39f5c9fa /libmpdemux | |
| parent | 9f22bac0f34eab9ccea130091601a1777973fe1d (diff) | |
| download | mpv-e5f9e5b0573a9b1175fae0656bddf4daa4d3744f.tar.bz2 mpv-e5f9e5b0573a9b1175fae0656bddf4daa4d3744f.tar.xz | |
while_encoding.avi (ffmpeg) fix (ignoring movi_ check if end<=start)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2440 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_avi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 7c27932a70..cc08073b1b 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -192,7 +192,7 @@ do{ } pos=idx->dwChunkOffset+priv->idx_offset; - if(pos<demux->movi_start || pos>=demux->movi_end){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos); continue; } @@ -224,7 +224,7 @@ do{ if(idx->dwFlags&AVIIF_KEYFRAME) flags=1; } else { demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end){ + if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start){ demux->stream->eof=1; return 0; } @@ -284,7 +284,7 @@ do{ } pos=idx->dwChunkOffset+priv->idx_offset; - if(pos<demux->movi_start || pos>=demux->movi_end){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos); continue; } @@ -347,7 +347,7 @@ int *fpos=NULL; do{ demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end){ + if(demux->filepos>=demux->movi_end && (demux->movi_end>demux->movi_start)){ demux->stream->eof=1; return 0; } |