virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

eatgv: use fixed-width types where appropriate.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-21 14:55:05 +01:00
parent c59211b437
commit f1c395944c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/eatgv.c
View File

@ -42,10 +42,10 @@ typedef struct TgvContext {
AVFrame frame; AVFrame frame;
AVFrame last_frame; AVFrame last_frame;
int width,height; int width,height;
unsigned int palette[AVPALETTE_COUNT]; uint32_t palette[AVPALETTE_COUNT];
int (*mv_codebook)[2]; int (*mv_codebook)[2];
unsigned char (*block_codebook)[16]; uint8_t (*block_codebook)[16];
int num_mvs; ///< current length of mv_codebook int num_mvs; ///< current length of mv_codebook
int num_blocks_packed; ///< current length of block_codebook int num_blocks_packed; ///< current length of block_codebook
} TgvContext; } TgvContext;
@ -64,11 +64,11 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx)
* @return 0 on success, -1 on critical buffer underflow * @return 0 on success, -1 on critical buffer underflow
*/ */
static int unpack(const uint8_t *src, const uint8_t *src_end, static int unpack(const uint8_t *src, const uint8_t *src_end,
unsigned char *dst, int width, int height) uint8_t *dst, int width, int height)
{ {
unsigned char *dst_end = dst + width*height; uint8_t *dst_end = dst + width*height;
int size, size1, size2, offset, run; int size, size1, size2, offset, run;
unsigned char *dst_start = dst; uint8_t *dst_start = dst;
if (src[0] & 0x01) if (src[0] & 0x01)
src += 5; src += 5;
@ -148,7 +148,7 @@ static int tgv_decode_inter(TgvContext *s, const uint8_t *buf,
int i,j,x,y; int i,j,x,y;
GetBitContext gb; GetBitContext gb;
int mvbits; int mvbits;
const unsigned char *blocks_raw; const uint8_t *blocks_raw;
if (buf + 12 > buf_end) if (buf + 12 > buf_end)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -172,7 +172,7 @@ static int tgv_decode_inter(TgvContext *s, const uint8_t *buf,
} }
if (num_blocks_packed > s->num_blocks_packed) { if (num_blocks_packed > s->num_blocks_packed) {
s->block_codebook = av_realloc(s->block_codebook, num_blocks_packed*16*sizeof(unsigned char)); s->block_codebook = av_realloc(s->block_codebook, num_blocks_packed*16);
s->num_blocks_packed = num_blocks_packed; s->num_blocks_packed = num_blocks_packed;
} }
@ -211,7 +211,7 @@ static int tgv_decode_inter(TgvContext *s, const uint8_t *buf,
for (y = 0; y < s->avctx->height / 4; y++) for (y = 0; y < s->avctx->height / 4; y++)
for (x = 0; x < s->avctx->width / 4; x++) { for (x = 0; x < s->avctx->width / 4; x++) {
unsigned int vector = get_bits(&gb, vector_bits); unsigned int vector = get_bits(&gb, vector_bits);
const unsigned char *src; const uint8_t *src;
int src_stride; int src_stride;
if (vector < num_mvs) { if (vector < num_mvs) {