Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 11:18:25 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 11:18:25 +0000 (12:18 +0100)
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
1  2 
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/bfin/dsputil_bfin.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/motion_est.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/sh4/dsputil_align.c
libavcodec/sparc/dsputil_vis.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_rnd_template.c
libavcodec/x86/hpeldsp.asm

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -288,12 -288,12 +288,12 @@@ static inline void FUNC(OPNAME ## _no_r
      FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), src3+8*sizeof(pixel), src4+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
  }\
  \
- static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *p_block, const uint8_t *p_pixels, int line_size, int h)\
+ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, const uint8_t *_pixels, ptrdiff_t line_size, int h)\
  {\
          int i, a0, b0, a1, b1;\
-         pixel *block = (pixel*)p_block;\
-         const pixel *pixels = (const pixel*)p_pixels;\
+         pixel *block = (pixel*)_block;\
+         const pixel *pixels = (const pixel*)_pixels;\
 -        line_size /= sizeof(pixel);\
 +        line_size >>= sizeof(pixel)-1;\
          a0= pixels[0];\
          b0= pixels[1] + 2;\
          a0 += b0;\
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge