On 04/27/2011 08:10 PM, Aℓex Converse wrote:
> ---
> libavcodec/indeo3.c | 22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
>
>
> --------------1
> Content-Type: text/x-patch; name="0001-indeo3-Eliminate-use-of-long.patch"
> Content-Transfer-Encoding: 8bit
> Content-Disposition: attachment;
> filename="0001-indeo3-Eliminate-use-of-long.patch"
>
> diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
> index 29a8d4a..30b7085 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;
Ok.
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
