ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ivi_dsp.c

 /*
  * DSP functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
  *
  * Copyright (c) 2009 Maxim Poliakovski
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 20 matching lines @@
 #include "ivi_common.h"
 #include "ivi_dsp.h"
 
 void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
                         const int dst_pitch, const int num_bands)
 {
     int             x, y, indx;
     int32_t         p0, p1, p2, p3, tmp0, tmp1, tmp2;
     int32_t         b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4, b2_5, b2_6;
     int32_t         b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9;
-    uint32_t        pitch, back_pitch;
+    int32_t         pitch, back_pitch;
     const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
 
     /* all bands should have the same pitch */
     pitch = plane->bands[0].pitch;
 
     /* pixels at the position "y-1" will be set to pixels at the "y" for the 1st iteration */
     back_pitch = 0;
 
     /* get pointers to the wavelet bands */
     b0_ptr = plane->bands[0].buf;
@@ skipping 405 matching lines @@
     } \
 } \
 
 #define OP_PUT(a, b)  (a) = (b)
 #define OP_ADD(a, b)  (a) += (b)
 
 IVI_MC_TEMPLATE(8, _no_delta, OP_PUT);
 IVI_MC_TEMPLATE(8, _delta,    OP_ADD);
 IVI_MC_TEMPLATE(4, _no_delta, OP_PUT);
 IVI_MC_TEMPLATE(4, _delta,    OP_ADD);