generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

indeo3: Eliminate use of long.

Browse Source
This commit is contained in:
Alex Converse 2011-04-24 17:33:37 -07:00 committed by Alex Converse
parent 47bc52f821
commit aab6374bbe
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/indeo3.c
View File

@ -149,13 +149,13 @@ static av_cold void iv_free_func(Indeo3DecodeContext *s)
} }
struct ustr { struct ustr {
long xpos; int xpos;
long ypos; int ypos;
long width; int width;
long height; int height;
long split_flag; int split_flag;
long split_direction; int split_direction;
long usl7; int usl7;
}; };
@ -203,12 +203,12 @@ struct ustr {
static void iv_Decode_Chunk(Indeo3DecodeContext *s, static void iv_Decode_Chunk(Indeo3DecodeContext *s,
uint8_t *cur, uint8_t *ref, int width, int height, uint8_t *cur, uint8_t *ref, int width, int height,
const uint8_t *buf1, long cb_offset, const uint8_t *hdr, const uint8_t *buf1, int cb_offset, const uint8_t *hdr,
const uint8_t *buf2, int min_width_160) const uint8_t *buf2, int min_width_160)
{ {
uint8_t bit_buf; uint8_t bit_buf;
unsigned long bit_pos, lv, lv1, lv2; unsigned int bit_pos, lv, lv1, lv2;
long *width_tbl, width_tbl_arr[10]; int *width_tbl, width_tbl_arr[10];
const signed char *ref_vectors; const signed char *ref_vectors;
uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2; uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2;
uint32_t *cur_lp, *ref_lp; uint32_t *cur_lp, *ref_lp;
@ -982,7 +982,7 @@ static int iv_decode_frame(AVCodecContext *avctx,
Indeo3DecodeContext *s = avctx->priv_data; Indeo3DecodeContext *s = avctx->priv_data;
unsigned int image_width, image_height, unsigned int image_width, image_height,
chroma_width, chroma_height; chroma_width, chroma_height;
unsigned long flags, cb_offset, data_size, unsigned int flags, cb_offset, data_size,
y_offset, v_offset, u_offset, mc_vector_count; y_offset, v_offset, u_offset, mc_vector_count;
const uint8_t *hdr_pos, *buf_pos; const uint8_t *hdr_pos, *buf_pos;