diff options
author | Alex Converse <aconverse@google.com> | 2011-04-25 04:33:37 +0400 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2011-05-04 08:20:05 +0400 |
commit | aab6374bbe2b6ce4ca82141be6a5b7b8875bf051 (patch) | |
tree | 43a1b436265e05d37c75831237fb5fccac747a91 /libavcodec/indeo3.c | |
parent | 47bc52f8216d9de3e50160adb929620ac31ede99 (diff) |
indeo3: Eliminate use of long.
Diffstat (limited to 'libavcodec/indeo3.c')
-rw-r--r-- | libavcodec/indeo3.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 29a8d4ad8c..30b70850f8 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -149,13 +149,13 @@ static av_cold void iv_free_func(Indeo3DecodeContext *s) } struct ustr { - long xpos; - long ypos; - long width; - long height; - long split_flag; - long split_direction; - long usl7; + int xpos; + int ypos; + int width; + int height; + int split_flag; + int split_direction; + int usl7; }; @@ -203,12 +203,12 @@ struct ustr { static void iv_Decode_Chunk(Indeo3DecodeContext *s, 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) { uint8_t bit_buf; - unsigned long bit_pos, lv, lv1, lv2; - long *width_tbl, width_tbl_arr[10]; + unsigned int bit_pos, lv, lv1, lv2; + int *width_tbl, width_tbl_arr[10]; const signed char *ref_vectors; uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2; uint32_t *cur_lp, *ref_lp; @@ -982,7 +982,7 @@ static int iv_decode_frame(AVCodecContext *avctx, Indeo3DecodeContext *s = avctx->priv_data; unsigned int image_width, image_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; const uint8_t *hdr_pos, *buf_pos; |