diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-13 10:23:34 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-14 12:52:33 +0200 |
| commit | b492561241f2a3263a8ab558fafc957130dbdfc1 (patch) | |
| tree | 5647d1b697422963b5d077cb0bed746d80171d54 | |
| parent | 74377fbfbf0a4dc7d1734403a901e726beaaae1e (diff) | |
| download | mpv-b492561241f2a3263a8ab558fafc957130dbdfc1.tar.bz2 mpv-b492561241f2a3263a8ab558fafc957130dbdfc1.tar.xz | |
demux_avi: remove pointless checks
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
| -rw-r--r-- | libmpdemux/demux_avi.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 1ed9145fd5..904f6b8675 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -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; priv->avi_audio_pts=0; // update blockcount: - priv->audio_block_no+=priv->audio_block_size ? - ((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; + priv->audio_block_no+= + (len+priv->audio_block_size-1)/priv->audio_block_size; } else if(ds==demux->video){ // video @@ -690,8 +690,8 @@ static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, break; } ++d_audio->pack_no; - priv->audio_block_no+=priv->audio_block_size ? - ((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; + priv->audio_block_no+= + (len+priv->audio_block_size-1)/priv->audio_block_size; d_audio->dpos+=len; } } @@ -716,12 +716,11 @@ static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, skip_audio_bytes+=len; } else { ++d_audio->pack_no; - priv->audio_block_no+=priv->audio_block_size ? - ((len+priv->audio_block_size-1)/priv->audio_block_size) : 1; + priv->audio_block_no+= + (len+priv->audio_block_size-1)/priv->audio_block_size; d_audio->dpos+=len; audio_chunk_pos=i; } - if(priv->audio_block_size) chunks-=(len+priv->audio_block_size-1)/priv->audio_block_size; } } |