RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert r22974 int->unsigned parts that don't have any meaningful effect. 

Originally committed as revision 23016 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2010-05-03 22:08:31 +00:00
parent 441ea0ce91
commit 4fe4bb6150
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/iff.c
View File

@ -32,7 +32,7 @@
typedef struct { typedef struct {
AVFrame frame; AVFrame frame;
unsigned planesize; int planesize;
uint8_t * planebuf; uint8_t * planebuf;
} IffContext; } IffContext;
@ -41,7 +41,7 @@ typedef struct {
*/ */
int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{ {
unsigned count, i; int count, i;
if (avctx->bits_per_coded_sample > 8) { if (avctx->bits_per_coded_sample > 8) {
av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n"); av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n");
@ -98,8 +98,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane)
{ {
GetBitContext gb; GetBitContext gb;
unsigned int i; int i;
const unsigned b = (buf_size * 8) + bps - 1; const int b = (buf_size * 8) + bps - 1;
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
for(i = 0; i < b; i++) { for(i = 0; i < b; i++) {
dst[i] |= get_bits1(&gb) << plane; dst[i] |= get_bits1(&gb) << plane;
@ -117,8 +117,8 @@ static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, i
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 bps, int plane)
{ {
GetBitContext gb; GetBitContext gb;
unsigned i; int i;
const unsigned b = (buf_size * 8) + bps - 1; const int b = (buf_size * 8) + bps - 1;
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
for(i = 0; i < b; i++) { for(i = 0; i < b; i++) {
dst[i] |= get_bits1(&gb) << plane; dst[i] |= get_bits1(&gb) << plane;
@ -131,9 +131,9 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
{ {
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->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; const uint8_t *buf_end = buf+buf_size;
unsigned y, plane; int y, plane;
if (avctx->reget_buffer(avctx, &s->frame) < 0){ if (avctx->reget_buffer(avctx, &s->frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
@ -171,9 +171,9 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
{ {
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->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; const uint8_t *buf_end = buf+buf_size;
unsigned y, plane, x; int y, plane, x;
if (avctx->reget_buffer(avctx, &s->frame) < 0){ if (avctx->reget_buffer(avctx, &s->frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");