Mercurial > libavcodec.hg
changeset 11693:3ec57be57312 libavcodec
Remove "bps" parameter to decodeplane8/32(), it's unused.
Patch by Sebastian Vater <cdgs basty googlemail com>.
| author | rbultje |
|---|---|
| date | Sun, 09 May 2010 20:08:13 +0000 |
| parents | 5eb6d3cbf257 |
| children | 5e8fdcac294e |
| files | iff.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/iff.c Sun May 09 16:24:20 2010 +0000 +++ b/iff.c Sun May 09 20:08:13 2010 +0000 @@ -135,10 +135,9 @@ * @param dst Destination buffer * @param buf Source buffer * @param buf_size - * @param bps bits_per_coded_sample (must be <= 8) * @param plane plane number to decode as */ -static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int bps, int plane) +static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane) { const uint64_t *lut = plane8_lut[plane]; while (buf_size--) { @@ -153,10 +152,9 @@ * @param dst Destination buffer * @param buf Source buffer * @param buf_size - * @param bps bits_per_coded_sample * @param plane plane number to decode as */ -static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) +static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int plane) { GetBitContext gb; int i; @@ -187,7 +185,7 @@ uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; memset(row, 0, avctx->width); for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { - decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); + decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); buf += s->planesize; } } @@ -196,7 +194,7 @@ uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; memset(row, 0, avctx->width << 2); for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { - decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); + decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); buf += s->planesize; } } @@ -243,7 +241,7 @@ } x += length; } - decodeplane8(row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); + decodeplane8(row, s->planebuf, s->planesize, plane); } } } else { //PIX_FMT_BGR32 @@ -266,7 +264,7 @@ } x += length; } - decodeplane32((uint32_t *) row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); + decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane); } } }