RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 02:09:52 +00:00
Code Issues Releases Wiki Activity

demux_avi: remove pointless checks

Browse Source 
If audio_block_size is 0 that is a bug (and will result in a division by 0
in one case that does not check this), thus remove all checks for it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32623 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-11-13 10:23:34 +00:00 committed by Uoti Urpala
parent 74377fbfbf
commit b492561241
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmpdemux/demux_avi.c
View File

@ -158,8 +158,8 @@ static int demux_avi_read_packet(demuxer_t *demux,demux_stream_t *ds,unsigned in
pts=priv->avi_audio_pts; //+priv->pts_correction; pts=priv->avi_audio_pts; //+priv->pts_correction;
priv->avi_audio_pts=0; priv->avi_audio_pts=0;
// update blockcount: // update blockcount:
priv->audio_block_no+=priv->audio_block_size ? priv->audio_block_no+=
((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; (len+priv->audio_block_size-1)/priv->audio_block_size;
} else } else
if(ds==demux->video){ if(ds==demux->video){
// video // video
@ -690,8 +690,8 @@ static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs,
break; break;
} }
++d_audio->pack_no; ++d_audio->pack_no;
priv->audio_block_no+=priv->audio_block_size ? priv->audio_block_no+=
((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; (len+priv->audio_block_size-1)/priv->audio_block_size;
d_audio->dpos+=len; d_audio->dpos+=len;
} }
} }
@ -716,12 +716,11 @@ static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs,
skip_audio_bytes+=len; skip_audio_bytes+=len;
} else { } else {
++d_audio->pack_no; ++d_audio->pack_no;
priv->audio_block_no+=priv->audio_block_size ? priv->audio_block_no+=
((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; (len+priv->audio_block_size-1)/priv->audio_block_size;
d_audio->dpos+=len; d_audio->dpos+=len;
audio_chunk_pos=i; audio_chunk_pos=i;
} }
if(priv->audio_block_size)
chunks-=(len+priv->audio_block_size-1)/priv->audio_block_size; chunks-=(len+priv->audio_block_size-1)/priv->audio_block_size;
} }
} }