Merge commit '21e500ba647aec233d5930d3d1081489d0d53ceb'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 08:17:34 +0000 (09:17 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 08:17:34 +0000 (09:17 +0100)
* commit '21e500ba647aec233d5930d3d1081489d0d53ceb':
  svq1dec: Change type of array pitch parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/svq1dec.c

@@@ -151,10 -152,10 +151,10 @@@ static const uint8_t string_table[256] 
                        16 * j) << (level + 1);                           \
      }                                                                   \
      mean -= stages * 128;                                               \
 -    n4    = mean + (mean >> 31) << 16 | (mean & 0xFFFF);
 +    n4    = (mean << 16) + mean;
  
  static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels,
-                                    int pitch)
+                                    ptrdiff_t pitch)
  {
      uint32_t bit_cache;
      uint8_t *list[63];