Mercurial > libavcodec.hg
changeset 11678:e1dd1ff1ab27 libavcodec
Revert r22974 int->unsigned parts that don't have any meaningful effect.
author | rbultje |
---|---|
date | Mon, 03 May 2010 22:08:31 +0000 |
parents | ed3d232c9d31 |
children | fe1e6103b68d |
files | iff.c |
diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/iff.c Mon May 03 19:21:35 2010 +0000 +++ b/iff.c Mon May 03 22:08:31 2010 +0000 @@ -32,7 +32,7 @@ typedef struct { AVFrame frame; - unsigned planesize; + int planesize; uint8_t * planebuf; } IffContext; @@ -41,7 +41,7 @@ */ int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) { - unsigned count, i; + int count, i; if (avctx->bits_per_coded_sample > 8) { av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n"); @@ -98,8 +98,8 @@ static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) { GetBitContext gb; - unsigned int i; - const unsigned b = (buf_size * 8) + bps - 1; + int i; + const int b = (buf_size * 8) + bps - 1; init_get_bits(&gb, buf, buf_size * 8); for(i = 0; i < b; i++) { dst[i] |= get_bits1(&gb) << plane; @@ -117,8 +117,8 @@ static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) { GetBitContext gb; - unsigned i; - const unsigned b = (buf_size * 8) + bps - 1; + int i; + const int b = (buf_size * 8) + bps - 1; init_get_bits(&gb, buf, buf_size * 8); for(i = 0; i < b; i++) { dst[i] |= get_bits1(&gb) << plane; @@ -131,9 +131,9 @@ { IffContext *s = avctx->priv_data; const uint8_t *buf = avpkt->data; - unsigned buf_size = avpkt->size; + int buf_size = avpkt->size; const uint8_t *buf_end = buf+buf_size; - unsigned y, plane; + int y, plane; if (avctx->reget_buffer(avctx, &s->frame) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); @@ -171,9 +171,9 @@ { IffContext *s = avctx->priv_data; const uint8_t *buf = avpkt->data; - unsigned buf_size = avpkt->size; + int buf_size = avpkt->size; const uint8_t *buf_end = buf+buf_size; - unsigned y, plane, x; + int y, plane, x; if (avctx->reget_buffer(avctx, &s->frame) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");