mirror of
https://github.com/mpv-player/mpv
synced 2025-01-20 14:20:55 +00:00
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
This commit is contained in:
parent
9f22bac0f3
commit
e5f9e5b057
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user