diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-07-29 12:45:31 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-07-31 17:23:31 +0200 |
| commit | 5caea648d40dd7a85304b8ca1257a3a9a729bbb4 (patch) | |
| tree | d3a3ece5fa251ed5146bdb80addd5ebea548af7a /libavcodec | |
| parent | 1c9878183772d770cc398e5e76c1db8f74a929fe (diff) | |
| download | ffmpeg-5caea648d40dd7a85304b8ca1257a3a9a729bbb4.tar.gz | |
8svx: remove useless rounding code.
samples_size and samples_idx are supposed to be multiple of
channels at all time. If they are, the division is exact;
if they are not, something is very wrong in the code.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/8svx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 3bece41627..967b8c9bbf 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -37,6 +37,7 @@ * http://aminet.net/mods/smpl/ */ +#include "libavutil/avassert.h" #include "avcodec.h" /** decoder context */ @@ -150,7 +151,8 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - esc->frame.nb_samples = (FFMIN(MAX_FRAME_SIZE, esc->samples_size - esc->samples_idx) +avctx->channels-1) / avctx->channels; + av_assert1(!(esc->samples_size % avctx->channels || esc->samples_idx % avctx->channels)); + esc->frame.nb_samples = FFMIN(MAX_FRAME_SIZE, esc->samples_size - esc->samples_idx) / avctx->channels; if ((ret = avctx->get_buffer(avctx, &esc->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; |